From c668fa6bb0b5ad26c9ddd7409c67572df23fb99e Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Fri, 1 Nov 2024 16:10:15 +0100 Subject: [PATCH] devops: stop testing on Ubuntu 20.04 --- .github/workflows/tests_primary.yml | 2 +- .github/workflows/tests_secondary.yml | 14 +++--- .github/workflows/tests_service.yml | 70 --------------------------- .github/workflows/tests_video.yml | 2 +- 4 files changed, 8 insertions(+), 80 deletions(-) delete mode 100644 .github/workflows/tests_service.yml diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml index 02847957c4..70113e501b 100644 --- a/.github/workflows/tests_primary.yml +++ b/.github/workflows/tests_primary.yml @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-22.04] runs-on: ${{ matrix.os }} permissions: id-token: write # This is required for OIDC login (azure/login) to succeed diff --git a/.github/workflows/tests_secondary.yml b/.github/workflows/tests_secondary.yml index 71c7ed105f..8d9ebfcf72 100644 --- a/.github/workflows/tests_secondary.yml +++ b/.github/workflows/tests_secondary.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: browser: [chromium, firefox, webkit] - os: [ubuntu-20.04, ubuntu-24.04] + os: [ubuntu-24.04] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -126,8 +126,6 @@ jobs: os: [ubuntu-24.04, macos-14-xlarge, windows-latest] include: # We have different binaries per Ubuntu version for WebKit. - - browser: webkit - os: ubuntu-20.04 - browser: webkit os: ubuntu-22.04 runs-on: ${{ matrix.os }} @@ -149,7 +147,7 @@ jobs: fail-fast: false matrix: mode: [driver, service] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/run-test @@ -175,7 +173,7 @@ jobs: - browser: webkit - browser: chromium channel: chromium-tip-of-tree - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/run-test @@ -198,7 +196,7 @@ jobs: fail-fast: false matrix: channel: [chrome, chrome-beta, msedge, msedge-beta, msedge-dev] - runs-on: [ubuntu-20.04, macos-latest, windows-latest] + runs-on: [ubuntu-22.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/run-test @@ -219,7 +217,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macos-13, windows-latest] + os: [ubuntu-22.04, macos-13, windows-latest] headed: ['--headed', ''] steps: - uses: actions/checkout@v4 @@ -241,7 +239,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-latest, macos-latest] + os: [ubuntu-22.04, windows-latest, macos-latest] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/run-test diff --git a/.github/workflows/tests_service.yml b/.github/workflows/tests_service.yml deleted file mode 100644 index 2d68740006..0000000000 --- a/.github/workflows/tests_service.yml +++ /dev/null @@ -1,70 +0,0 @@ -name: "tests service" - -on: - workflow_dispatch: - -env: - FORCE_COLOR: 1 - ELECTRON_SKIP_BINARY_DOWNLOAD: 1 - -jobs: - test: - name: "Service" - strategy: - fail-fast: false - matrix: - service-os: [linux, windows] - browser: [chromium, firefox, webkit] - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - - run: npm ci - env: - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - - run: npm run build - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=${{ matrix.browser }}-* --workers=10 --retries=0 - env: - PWTEST_MODE: service2 - PWTEST_TRACE: 1 - PWTEST_BOT_NAME: "${{ matrix.browser }}-${{ matrix.service-os }}-service" - PLAYWRIGHT_SERVICE_ACCESS_KEY: ${{ secrets.PLAYWRIGHT_SERVICE_ACCESS_KEY }} - PLAYWRIGHT_SERVICE_URL: ${{ secrets.PLAYWRIGHT_SERVICE_URL }} - PLAYWRIGHT_SERVICE_OS: ${{ matrix.service-os }} - PLAYWRIGHT_SERVICE_RUN_ID: ${{ github.run_id }}-${{ github.run_attempt }}-${{ github.sha }} - - name: Upload blob report to GitHub - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - name: all-blob-reports - path: blob-report - retention-days: 2 - - merge_reports: - name: "Merge reports" - needs: [test] - if: ${{ !cancelled() }} - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - - run: npm ci - env: - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - - run: npm run build - - name: Download blob report artifact - uses: actions/download-artifact@v4 - with: - name: all-blob-reports - path: all-blob-reports - - run: npx playwright merge-reports --reporter markdown,html ./all-blob-reports - - name: Upload HTML report to Azure - run: | - REPORT_DIR='run-service-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.sha }}' - azcopy cp --recursive "./playwright-report/*" "https://mspwblobreport.blob.core.windows.net/\$web/$REPORT_DIR" - echo "Report url: https://mspwblobreport.z1.web.core.windows.net/$REPORT_DIR/index.html#?q=s:failed" - env: - AZCOPY_AUTO_LOGIN_TYPE: SPN - AZCOPY_SPA_APPLICATION_ID: '${{ secrets.AZCOPY_SPA_APPLICATION_ID }}' - AZCOPY_SPA_CLIENT_SECRET: '${{ secrets.AZCOPY_SPA_CLIENT_SECRET }}' - AZCOPY_TENANT_ID: '${{ secrets.AZCOPY_TENANT_ID }}' diff --git a/.github/workflows/tests_video.yml b/.github/workflows/tests_video.yml index 0733b082a0..cc303d79c5 100644 --- a/.github/workflows/tests_video.yml +++ b/.github/workflows/tests_video.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: browser: [chromium, firefox, webkit] - os: [ubuntu-20.04, ubuntu-22.04] + os: [ubuntu-22.04, ubuntu-24.04] permissions: id-token: write # This is required for OIDC login (azure/login) to succeed contents: read # This is required for actions/checkout to succeed