Try to fix flaky playwright tests not being reported (#40290)

WordPress · Apr 13, 2022 · eb61ff9 · eb61ff9
1 parent 00ef72b
commit eb61ff9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/report-flaky-tests/action.yml b/.github/report-flaky-tests/action.yml
@@ -8,8 +8,8 @@ inputs:
         description: 'The flaky-test label name'
         required: true
         default: 'flaky-test'
-    artifact-name:
-        description: 'The name of the uploaded artifact'
+    artifact-name-prefix:
+        description: 'The prefix name of the uploaded artifact'
         required: true
         default: 'flaky-tests-report'
 runs:

diff --git a/.github/report-flaky-tests/index.js b/.github/report-flaky-tests/index.js
@@ -29,13 +29,15 @@ const metaData = {
 ( async function run() {
 	const token = core.getInput( 'repo-token', { required: true } );
 	const label = core.getInput( 'label', { required: true } );
-	const artifactName = core.getInput( 'artifact-name', { required: true } );
+	const artifactNamePrefix = core.getInput( 'artifact-name-prefix', {
+		required: true,
+	} );
 
 	const octokit = github.getOctokit( token );
 
 	const flakyTests = await downloadReportFromArtifact(
 		octokit,
-		artifactName
+		artifactNamePrefix
 	);
 
 	if ( ! flakyTests ) {
@@ -191,16 +193,16 @@ async function fetchAllIssuesLabeledFlaky( octokit, label ) {
 	return issues;
 }
 
-async function downloadReportFromArtifact( octokit, artifactName ) {
+async function downloadReportFromArtifact( octokit, artifactNamePrefix ) {
 	const {
 		data: { artifacts },
 	} = await octokit.rest.actions.listWorkflowRunArtifacts( {
 		...github.context.repo,
 		run_id: github.context.payload.workflow_run.id,
 	} );
 
-	const matchArtifact = artifacts.find(
-		( artifact ) => artifact.name === artifactName
+	const matchArtifact = artifacts.find( ( artifact ) =>
+		artifact.name.startsWith( artifactNamePrefix )
 	);
 
 	if ( ! matchArtifact ) {

diff --git a/.github/workflows/end2end-test-playwright.yml b/.github/workflows/end2end-test-playwright.yml
@@ -63,6 +63,6 @@ jobs:
               uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
               if: always()
               with:
-                  name: flaky-tests-report
+                  name: flaky-tests-report-playwright
                   path: flaky-tests
                   if-no-files-found: ignore
diff --git a/.github/workflows/end2end-test.yml b/.github/workflows/end2end-test.yml
@@ -61,6 +61,6 @@ jobs:
               uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
               if: always()
               with:
-                  name: flaky-tests-report
+                  name: flaky-tests-report-${{ matrix.part }}
                   path: flaky-tests
                   if-no-files-found: ignore
diff --git a/.github/workflows/flaky-tests.yml b/.github/workflows/flaky-tests.yml
@@ -2,9 +2,7 @@ name: Report Flaky Tests
 
 on:
     workflow_run:
-        # We should also add 'End-to-End Tests Playwright' here but that
-        # wil run this workflow whenever either one of them completes.
-        workflows: ['End-to-End Tests']
+        workflows: ['End-to-End Tests', 'End-to-End Tests Playwright']
         types:
             - completed
 
@@ -31,4 +29,4 @@ jobs:
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
                   label: '[Type] Flaky Test'
-                  artifact-name: flaky-tests-report
+                  artifact-name-prefix: flaky-tests-report