diff --git a/.github/workflows/tests_service.yml b/.github/workflows/tests_service.yml index e7c10f49db..f03576f438 100644 --- a/.github/workflows/tests_service.yml +++ b/.github/workflows/tests_service.yml @@ -26,21 +26,17 @@ jobs: - 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_BLOB_SUFFIX: "-${{ matrix.service-os }}-service" + PWTEST_BLOB_SUFFIX: "-${{ 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: Zip blob report - if: always() - run: zip -r ../blob-report-${{ matrix.browser }}-${{ matrix.service-os }}.zip . - working-directory: blob-report - name: Upload blob report to GitHub if: always() uses: actions/upload-artifact@v3 with: - name: blob-report-${{ github.run_attempt }} - path: blob-report-${{ matrix.browser }}-${{ matrix.service-os }}.zip + name: all-blob-reports + path: blob-report retention-days: 2 merge_reports: @@ -58,11 +54,9 @@ jobs: - name: Download blob report artifact uses: actions/download-artifact@v3 with: - name: blob-report-${{ github.run_attempt }} - path: blob-report-zips - - name: Unzip all blob reports - run: unzip -o 'blob-report-zips/blob-report-*.zip' -d blob-report - - run: npx playwright merge-reports --reporter markdown,html ./blob-report + 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 }}'