From c344fce7b68da8ff6c690d6021ab990d022f8917 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 18 Aug 2023 12:16:26 -0700 Subject: [PATCH] devops: simplify upload-blob-report action (#26548) --- .github/actions/upload-blob-report/action.yml | 14 +--- .github/workflows/tests_primary.yml | 9 +-- .github/workflows/tests_secondary.yml | 81 +++++++------------ 3 files changed, 32 insertions(+), 72 deletions(-) diff --git a/.github/actions/upload-blob-report/action.yml b/.github/actions/upload-blob-report/action.yml index 284d7820f6..9a091dce5c 100644 --- a/.github/actions/upload-blob-report/action.yml +++ b/.github/actions/upload-blob-report/action.yml @@ -1,31 +1,21 @@ name: 'Upload blob report' -description: 'Upload blob to Azure blob storage or to GitHub artifacts (for pull requests)' +description: 'Upload blob report to GitHub artifacts (for pull requests)' inputs: report_dir: description: 'Directory containing blob report' required: true type: string default: 'blob-report' - connection_string: - description: 'Azure connection string' - required: true - type: string runs: using: "composite" steps: - - name: Upload blob report to Azure - if: always() && github.event_name == 'push' - shell: bash - run: | - REPORT_DIR='run-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.sha }}' - az storage blob upload-batch -s "${{ inputs.report_dir }}" -d "\$web/$REPORT_DIR" --connection-string "${{ inputs.connection_string }}" - name: Upload blob report to GitHub if: always() && github.event_name == 'pull_request' uses: actions/upload-artifact@v3 with: name: all-blob-reports path: ${{ inputs.report_dir }} - retention-days: 30 + retention-days: 7 - name: Write triggering pull request number in a file if: always() && github.event_name == 'pull_request' shell: bash diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml index 2af384c95a..4fa4749af2 100644 --- a/.github/workflows/tests_primary.yml +++ b/.github/workflows/tests_primary.yml @@ -61,11 +61,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' test_linux_chromium_tot: name: ${{ matrix.os }} (chromium tip-of-tree) @@ -93,11 +92,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' test_test_runner: name: Test Runner @@ -143,11 +141,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' test_web_components: name: Web Components diff --git a/.github/workflows/tests_secondary.yml b/.github/workflows/tests_secondary.yml index a3e1c9a187..3b8a017d1c 100644 --- a/.github/workflows/tests_secondary.yml +++ b/.github/workflows/tests_secondary.yml @@ -48,11 +48,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' test_mac: name: ${{ matrix.os }} (${{ matrix.browser }}) @@ -80,11 +79,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' test_win: name: "Windows" @@ -112,11 +110,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' test-package-installations-other-node-versions: name: "Installation Test ${{ matrix.os }} (${{ matrix.node_version }})" @@ -179,11 +176,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' transport_linux: name: "Transport" @@ -211,11 +207,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' tracing_linux: name: Tracing ${{ matrix.browser }} ${{ matrix.channel }} @@ -249,11 +244,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chrome_stable_linux: name: "Chrome Stable (Linux)" @@ -276,11 +270,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chrome_stable_win: name: "Chrome Stable (Win)" @@ -304,11 +297,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chrome_stable_mac: name: "Chrome Stable (Mac)" @@ -331,11 +323,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chromium_tot: name: Chromium TOT ${{ matrix.os }} @@ -368,11 +359,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chromium_tot_headed: name: Chromium TOT headed ${{ matrix.os }} @@ -405,11 +395,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' firefox_beta_linux: name: "Firefox Beta (Linux)" @@ -432,11 +421,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' firefox_beta_win: name: "Firefox Beta (Win)" @@ -460,11 +448,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' firefox_beta_mac: name: "Firefox Beta (Mac)" @@ -487,11 +474,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_stable_mac: name: "Edge Stable (Mac)" @@ -514,11 +500,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_stable_win: name: "Edge Stable (Win)" @@ -542,11 +527,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_stable_linux: name: "Edge Stable (Linux)" @@ -569,11 +553,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_beta_mac: name: "Edge Beta (Mac)" @@ -596,11 +579,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_beta_win: name: "Edge Beta (Win)" @@ -624,11 +606,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_beta_linux: name: "Edge Beta (Linux)" @@ -651,11 +632,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_dev_mac: name: "Edge Dev (Mac)" @@ -678,11 +658,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_dev_win: name: "Edge Dev (Win)" @@ -706,11 +685,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' edge_dev_linux: name: "Edge Dev (Linux)" @@ -733,11 +711,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chrome_beta_linux: name: "Chrome Beta (Linux)" @@ -760,11 +737,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chrome_beta_win: name: "Chrome Beta (Win)" @@ -788,11 +764,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' chrome_beta_mac: name: "Chrome Beta (Mac)" @@ -815,11 +790,10 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}' build-playwright-driver: name: "build-playwright-driver" @@ -857,8 +831,7 @@ jobs: if: always() shell: bash - name: Upload blob report - if: always() && github.event_name == 'pull_request' + if: always() uses: ./.github/actions/upload-blob-report with: report_dir: blob-report - connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}'