From fd47ea5be81ad0f9551f4412f40d5b86a0af817c Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Thu, 22 May 2025 13:00:57 +0200
Subject: [PATCH] Revert "introduce sharding (#39774)" (#39895)

This reverts commit cf47bef66b391ecf16556d22dbb8368bb0d284b8.
---
 .github/workflows/js-ci.yml           | 50 ++++++---------------------
 js/apps/admin-ui/output-config.ts     |  6 ----
 js/apps/admin-ui/playwright.config.ts |  2 +-
 3 files changed, 12 insertions(+), 46 deletions(-)
 delete mode 100644 js/apps/admin-ui/output-config.ts

diff --git a/.github/workflows/js-ci.yml b/.github/workflows/js-ci.yml
index 38ad09c32a3..2366ea3a69e 100644
--- a/.github/workflows/js-ci.yml
+++ b/.github/workflows/js-ci.yml
@@ -191,6 +191,7 @@ jobs:
           name: account-ui-server-log
           path: ~/server.log
 
+
   generate-test-seed:
     name: Generate Test Seed
     needs:
@@ -218,8 +219,6 @@ jobs:
       WORKSPACE: keycloak-admin-ui
     strategy:
       matrix:
-        shardIndex: [1, 2, 3, 4]
-        shardTotal: [4]
         browser: [chromium, firefox]
         exclude:
           # Only test with Firefox on scheduled runs
@@ -257,50 +256,23 @@ jobs:
         working-directory: js
 
       - name: Run Playwright tests
-        run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} test:integration --project=${{ matrix.browser }} --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
-        working-directory: js
-
-      - name: Upload blob report to GitHub Actions Artifacts
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: blob-report-${{ matrix.shardIndex }}
-          path: ./js/apps/admin-ui/blob-report
-          retention-days: 1
-
-      - name: Upload server logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: admin-ui-server-log-${{ matrix.browser }}-${{ matrix.shardIndex }}
-          path: ~/server.log
-
-  merge-reports:
-    name: Merge Playwright reports
-    if: ${{ !cancelled() }}
-    needs: [admin-ui-e2e]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/pnpm-setup
-
-      - name: Download blob reports from GitHub Actions Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: ~/all-blob-reports/
-          pattern: blob-report-*
-          merge-multiple: true
-
-      - name: Merge Playwright reports
-        run: pnpm --fail-if-no-match --filter keycloak-admin-ui exec playwright merge-reports  -c ./output-config.ts ~/all-blob-reports
+        run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} test:integration --project=${{ matrix.browser }}
         working-directory: js
 
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: admin-ui-playwright-report
+          name: admin-ui-playwright-report-${{ matrix.browser }}
           path: js/apps/admin-ui/playwright-report
+          retention-days: 30
+
+      - name: Upload server logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: admin-ui-server-log-${{ matrix.browser }}
+          path: ~/server.log
 
   check:
     name: Status Check - Keycloak JavaScript CI
diff --git a/js/apps/admin-ui/output-config.ts b/js/apps/admin-ui/output-config.ts
deleted file mode 100644
index d7654869c90..00000000000
--- a/js/apps/admin-ui/output-config.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { defineConfig } from "@playwright/test";
-
-// used by GHA to generate the report
-export default defineConfig({
-  reporter: [["html", { outputFile: "playwright-report", open: "never" }]],
-});
diff --git a/js/apps/admin-ui/playwright.config.ts b/js/apps/admin-ui/playwright.config.ts
index 839188ed2dd..2eb54e96dcd 100644
--- a/js/apps/admin-ui/playwright.config.ts
+++ b/js/apps/admin-ui/playwright.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
   forbidOnly: !!process.env.CI,
   retries: retryCount,
   workers: 1,
-  reporter: process.env.CI ? "blob" : "list",
+  reporter: process.env.CI ? [["github"], ["html"]] : "list",
 
   use: {
     baseURL: "http://localhost:8080",