From b71e3f407e7c77d38b30a25b7b521a4de66a8ee3 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 18 Aug 2024 08:50:36 -0400 Subject: [PATCH] Make re-run flaky tests work with CI Security workflow --- .github/workflows/rerun-flaky-tests.yml | 2 +- .github/workflows/scripts/rerunFlakyTests.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rerun-flaky-tests.yml b/.github/workflows/rerun-flaky-tests.yml index 9016637a49..806d89e359 100644 --- a/.github/workflows/rerun-flaky-tests.yml +++ b/.github/workflows/rerun-flaky-tests.yml @@ -1,7 +1,7 @@ name: Rerun Flaky Live Tests on: workflow_run: - workflows: [CI Pipeline] + workflows: ['CI Pipeline', 'CI Security'] types: - completed jobs: diff --git a/.github/workflows/scripts/rerunFlakyTests.js b/.github/workflows/scripts/rerunFlakyTests.js index 589d6d85c9..d191983878 100644 --- a/.github/workflows/scripts/rerunFlakyTests.js +++ b/.github/workflows/scripts/rerunFlakyTests.js @@ -38,7 +38,9 @@ export async function rerunFlakyTests({ github, context }) { const filteredFailingJobs = failingJobs.filter((job) => { console.log(`Failing job: ${job.name}`) - return CONSIDERED_JOBS.some((title) => job.name.startsWith(title)); + return CONSIDERED_JOBS + .flatMap(jobName => [jobName, 'CI Pipeline / ' + jobName]) + .some((title) => job.name.startsWith(title)); }); if (filteredFailingJobs.length !== failingJobs.length) { console.log("One or more failing jobs are NOT designated flaky. Not rerunning.");