devops: always create blob report on CI, write PR number within action (

#24241)
microsoft · Jul 14, 2023 · d92db9a · d92db9a
1 parent 41643d0
commit d92db9a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 38 deletions.
diff --git a/.github/actions/upload-blob-report/action.yml b/.github/actions/upload-blob-report/action.yml
@@ -25,4 +25,14 @@ runs:
       with:
         name: blob-report-${{ github.run_attempt }}
         path: ${{ inputs.report_dir }}
-        retention-days: 30
+        retention-days: 30
+    - name: Write triggering pull request number in a file
+      if: always() && github.event_name == 'pull_request'
+      shell: bash
+      run: echo '${{ github.event.number }}' > pull_request_number.txt;
+    - name: Upload artifact with the pull request number
+      if: always() && github.event_name == 'pull_request'
+      uses: actions/upload-artifact@v3
+      with:
+        name: pull-request
+        path: pull_request_number.txt
diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml
@@ -55,7 +55,6 @@ jobs:
     - run: npx playwright install --with-deps ${{ matrix.browser }} chromium
     - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=${{ matrix.browser }}
       env:
-        PWTEST_BLOB_REPORT: 1
         PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-node${{ matrix.node-version }}"
     - run: node tests/config/checkCoverage.js ${{ matrix.browser }}
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
@@ -89,7 +88,6 @@ jobs:
     - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=chromium
       env:
         PWTEST_CHANNEL: chromium-tip-of-tree
-        PWTEST_BLOB_REPORT: 1
         PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-chromium-tip-of-tree"
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
@@ -129,12 +127,10 @@ jobs:
     - run: npx playwright install --with-deps
     - run: npm run ttest -- --shard ${{ matrix.shard }}
       env:
-        PWTEST_BLOB_REPORT: 1
         PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-node${{ matrix.node-version }}"
       if: matrix.os != 'ubuntu-latest'
     - run: xvfb-run npm run ttest --  --shard ${{ matrix.shard }}
       env:
-        PWTEST_BLOB_REPORT: 1
         PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-node${{ matrix.node-version }}"
       if: matrix.os == 'ubuntu-latest'
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
@@ -220,17 +216,3 @@ jobs:
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
       shell: bash
-
-  write-pull-request-number:
-    name: Write PR number
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-    - name: Write triggering pull request number in a file
-      shell: bash
-      run: echo '${{ github.event.number }}' > pull_request_number.txt;
-    - name: Upload artifact with the pull request number
-      uses: actions/upload-artifact@v3
-      with:
-        name: pull-request
-        path: pull_request_number.txt
diff --git a/.github/workflows/tests_secondary.yml b/.github/workflows/tests_secondary.yml
@@ -203,7 +203,6 @@ jobs:
       env:
         PWTEST_TRACE: 1
         PWTEST_CHANNEL: ${{ matrix.channel }}
-        PWTEST_BLOB_REPORT: 1
         PWTEST_BLOB_SUFFIX: ${{ (matrix.channel && format('-{0}', matrix.channel)) || '' }}
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
@@ -673,17 +672,3 @@ jobs:
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
       shell: bash
-
-  write-pull-request-number:
-    name: Write PR number
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-    - name: Write triggering pull request number in a file
-      shell: bash
-      run: echo '${{ github.event.number }}' > pull_request_number.txt;
-    - name: Upload artifact with the pull request number
-      uses: actions/upload-artifact@v3
-      with:
-        name: pull-request
-        path: pull_request_number.txt
diff --git a/tests/library/playwright.config.ts b/tests/library/playwright.config.ts
@@ -46,11 +46,10 @@ const reporters = () => {
   const result: ReporterDescription[] = process.env.CI ? [
     ['dot'],
     ['json', { outputFile: path.join(outputDir, 'report.json') }],
+    ['blob', { outputDir: path.join(outputDir, 'blob-report') }],
   ] : [
     ['html', { open: 'on-failure' }]
   ];
-  if (process.env.PWTEST_BLOB_REPORT === '1')
-    result.push(['blob', { outputDir: path.join(outputDir, 'blob-report') }]);
   return result;
 };
 const config: Config<CoverageWorkerOptions & PlaywrightWorkerOptions & PlaywrightTestOptions & TestModeWorkerOptions> = {

diff --git a/tests/playwright-test/playwright.config.ts b/tests/playwright-test/playwright.config.ts
@@ -25,11 +25,10 @@ const reporters = () => {
   const result: ReporterDescription[] = process.env.CI ? [
     ['dot'],
     ['json', { outputFile: path.join(outputDir, 'report.json') }],
+    ['blob', { outputDir: path.join(outputDir, 'blob-report') }],
   ] : [
     ['list']
   ];
-  if (process.env.PWTEST_BLOB_REPORT === '1')
-    result.push(['blob', { outputDir: path.join(outputDir, 'blob-report') }]);
   return result;
 };
 export default defineConfig({