Make playwright run faster by using port 9090 on compiled binary and avoiding to run on port 5005 that can be skipped if we incorporate istanbul plugin on the assets since the start and then coverage can be obtained from port 9090 instead saving time.

cniackz · MinIO Bot · commit 9f43602425e0 · 2023-03-25T09:14:30.000-04:00
diff --git a/.github/workflows/jobs.yaml b/.github/workflows/jobs.yaml
@@ -1308,9 +1308,92 @@ jobs:
             exit 1
           fi
 
+  ui-assets-istanbul-coverage:
+    name: "Assets with Istanbul Plugin for coverage"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [1.19.x]
+        os: [ubuntu-latest]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Read .nvmrc
+        id: node_version
+        run: echo "$(cat .nvmrc)" && echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_ENV
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NVMRC }}
+          cache: "yarn"
+          cache-dependency-path: portal-ui/yarn.lock
+      - uses: actions/cache@v3
+        id: assets-cache-istanbul-coverage
+        name: Assets Cache Istanbul Coverage
+        with:
+          path: |
+            ./portal-ui/build/
+          key: ${{ runner.os }}-assets-istanbul-coverage-${{ github.run_id }}
+      - name: Install Dependencies
+        working-directory: ./portal-ui
+        continue-on-error: false
+        run: |
+          yarn install --frozen-lockfile --immutable
+      - name: Check for Warnings in build output
+        working-directory: ./portal-ui
+        continue-on-error: false
+        run: |
+          ./check-warnings-istanbul-coverage.sh
+      - name: Check if Files are Prettified
+        working-directory: ./portal-ui
+        continue-on-error: false
+        run: |
+          ./check-prettier.sh
+
+  compile-binary-istanbul-coverage:
+    name: "Compile Console Binary with Istanbul Plugin for Coverage"
+    needs:
+      - lint-job
+      - ui-assets-istanbul-coverage
+      - reuse-golang-dependencies
+      - semgrep-static-code-analysis
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go-version: [1.19.x]
+        os: [ubuntu-latest]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+          cache: true
+        id: go
+      - uses: actions/cache@v3
+        name: Console Binary Cache Istanbul Coverage
+        with:
+          path: |
+            ./console
+          key: ${{ runner.os }}-binary-istanbul-coverage-${{ github.run_id }}
+      - uses: actions/cache@v3
+        id: assets-cache-istanbul-coverage
+        name: Assets Cache Istanbul Coverage
+        with:
+          path: |
+            ./portal-ui/build/
+          key: ${{ runner.os }}-assets-istanbul-coverage-${{ github.run_id }}
+      - name: Build on ${{ matrix.os }}
+        env:
+          GO111MODULE: on
+          GOOS: linux
+        run: |
+          make console
+
   playwright:
     needs:
-      - compile-binary
+      - compile-binary-istanbul-coverage
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
@@ -1337,21 +1420,16 @@ jobs:
         run: npx playwright install --with-deps
 
       - uses: actions/cache@v3
-        name: Console Binary Cache
+        name: Console Binary Cache Istanbul Coverage
         with:
           path: |
             ./console
-          key: ${{ runner.os }}-binary-${{ github.run_id }}
+          key: ${{ runner.os }}-binary-istanbul-coverage-${{ github.run_id }}
 
       - name: Start Console, front-end app and initialize users/policies
         run: |
           (./console server) & (make initialize-permissions)
 
-      - name: Start Browser at port 5005
-        run: |
-          echo "yarn playwright"
-          (cd $GITHUB_WORKSPACE/portal-ui; yarn playwright) & (sleep 120) # To start port 5005 with Istanbul Plugin Injected
-
       - name: Run Playwright tests
         run: |
           echo "Run tests under playwright folder only"
diff --git a/portal-ui/Makefile b/portal-ui/Makefile
@@ -5,6 +5,11 @@ build-static:
 	@if [ -f "${NVM_DIR}/nvm.sh" ]; then \. "${NVM_DIR}/nvm.sh" && nvm install && nvm use; fi && \
 	  NODE_OPTIONS=--openssl-legacy-provider yarn build
 
+build-static-istanbul-coverage:
+	@echo "Building frontend static assets to 'build'"
+	@if [ -f "${NVM_DIR}/nvm.sh" ]; then \. "${NVM_DIR}/nvm.sh" && nvm install && nvm use; fi && \
+	  NODE_OPTIONS=--openssl-legacy-provider yarn buildistanbulcoverage
+
 test-warnings:
 	./check-warnings.sh
 
diff --git a/portal-ui/check-warnings-istanbul-coverage.sh b/portal-ui/check-warnings-istanbul-coverage.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+yell() { echo "$0: $*" >&2; }
+
+die() {
+  yell "$*"
+  cat yarn.log
+  exit 111
+}
+
+try() { "$@" &> yarn.log || die "cannot $*"; }
+
+rm -f yarn.log
+try make build-static-istanbul-coverage
+
+if cat yarn.log | grep "Compiled with warnings"; then
+  echo "There are warnings in the code"
+  exit 1
+fi
diff --git a/portal-ui/e2e/auth.setup.ts b/portal-ui/e2e/auth.setup.ts
@@ -18,7 +18,7 @@ import { minioadminFile } from "./consts";
 
 setup("authenticate as admin", async ({ page }) => {
   // Perform authentication steps. Replace these actions with your own.
-  await page.goto("http://localhost:5005");
+  await page.goto("http://localhost:9090");
   await page.getByPlaceholder("Username").click();
   await page.getByPlaceholder("Username").fill("minioadmin");
   await page.getByPlaceholder("Password").click();
diff --git a/portal-ui/e2e/buckets.spec.ts b/portal-ui/e2e/buckets.spec.ts
@@ -20,7 +20,7 @@ import { minioadminFile } from "./consts";
 test.use({ storageState: minioadminFile });
 
 test.beforeEach(async ({ page }) => {
-  await page.goto("http://localhost:5005/");
+  await page.goto("http://localhost:9090/");
 });
 
 test("create a new bucket", async ({ page }) => {
diff --git a/portal-ui/e2e/groups.spec.ts b/portal-ui/e2e/groups.spec.ts
@@ -21,7 +21,7 @@ import { minioadminFile } from "./consts";
 test.use({ storageState: minioadminFile });
 
 test.beforeEach(async ({ page }) => {
-  await page.goto("http://localhost:5005/");
+  await page.goto("http://localhost:9090/");
 });
 
 test("Add a new group", async ({ page }) => {
diff --git a/portal-ui/e2e/login.spec.ts b/portal-ui/e2e/login.spec.ts
@@ -1,7 +1,7 @@
 import { test, expect } from "@playwright/test";
 
 test("Basic `minioadmin` Login", async ({ page, context }) => {
-  await page.goto("http://localhost:5005");
+  await page.goto("http://localhost:9090");
   await page.getByPlaceholder("Username").click();
   await page.getByPlaceholder("Username").fill("minioadmin");
   await page.getByPlaceholder("Password").click();
diff --git a/portal-ui/e2e/policies.spec.ts b/portal-ui/e2e/policies.spec.ts
@@ -20,7 +20,7 @@ import { minioadminFile } from "./consts";
 test.use({ storageState: minioadminFile });
 
 test.beforeEach(async ({ page }) => {
-  await page.goto("http://localhost:5005/");
+  await page.goto("http://localhost:9090/");
 });
 
 test("Can create a policy", async ({ page }) => {
diff --git a/portal-ui/package.json b/portal-ui/package.json
@@ -40,6 +40,7 @@
   "scripts": {
     "start": "PORT=5005 react-scripts start",
     "build": "react-scripts build",
+    "buildistanbulcoverage": "PORT=9090 USE_BABEL_PLUGIN_ISTANBUL=1 react-app-rewired build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "playwright": "PORT=5005 USE_BABEL_PLUGIN_ISTANBUL=1 react-app-rewired start"
diff --git a/portal-ui/playwright/jobs.yaml b/portal-ui/playwright/jobs.yaml
@@ -40,8 +40,8 @@ jobs:
         run: |
           make verifiers
 
-  ui-assets:
-    name: "React Code Has No Warnings & Prettified"
+  ui-assets-istanbul-coverage:
+    name: "Assets with Istanbul Plugin for coverage"
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -59,12 +59,12 @@ jobs:
           cache: "yarn"
           cache-dependency-path: portal-ui/yarn.lock
       - uses: actions/cache@v3
-        id: assets-cache
-        name: Assets Cache
+        id: assets-cache-istanbul-coverage
+        name: Assets Cache Istanbul Coverage
         with:
           path: |
             ./portal-ui/build/
-          key: ${{ runner.os }}-assets-${{ github.run_id }}
+          key: ${{ runner.os }}-assets-istanbul-coverage-${{ github.run_id }}
       - name: Install Dependencies
         working-directory: ./portal-ui
         continue-on-error: false
@@ -74,7 +74,7 @@ jobs:
         working-directory: ./portal-ui
         continue-on-error: false
         run: |
-          ./check-warnings.sh
+          ./check-warnings-istanbul-coverage.sh
       - name: Check if Files are Prettified
         working-directory: ./portal-ui
         continue-on-error: false
@@ -122,11 +122,11 @@ jobs:
           pip3 install semgrep
           semgrep --config semgrep.yaml $(pwd)/portal-ui --error
 
-  compile-binary:
-    name: Compiles on Go ${{ matrix.go-version }} and ${{ matrix.os }}
+  compile-binary-istanbul-coverage:
+    name: "Compile Console Binary with Istanbul Plugin for Coverage"
     needs:
       - lint-job
-      - ui-assets
+      - ui-assets-istanbul-coverage
       - reuse-golang-dependencies
       - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
@@ -145,18 +145,18 @@ jobs:
           cache: true
         id: go
       - uses: actions/cache@v3
-        name: Console Binary Cache
+        name: Console Binary Cache Istanbul Coverage
         with:
           path: |
             ./console
-          key: ${{ runner.os }}-binary-${{ github.run_id }}
+          key: ${{ runner.os }}-binary-istanbul-coverage-${{ github.run_id }}
       - uses: actions/cache@v3
-        id: assets-cache
-        name: Assets Cache
+        id: assets-cache-istanbul-coverage
+        name: Assets Cache Istanbul Coverage
         with:
           path: |
             ./portal-ui/build/
-          key: ${{ runner.os }}-assets-${{ github.run_id }}
+          key: ${{ runner.os }}-assets-istanbul-coverage-${{ github.run_id }}
       - name: Build on ${{ matrix.os }}
         env:
           GO111MODULE: on
@@ -166,7 +166,7 @@ jobs:
 
   playwright:
     needs:
-      - compile-binary
+      - compile-binary-istanbul-coverage
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
@@ -193,21 +193,16 @@ jobs:
         run: npx playwright install --with-deps
 
       - uses: actions/cache@v3
-        name: Console Binary Cache
+        name: Console Binary Cache Istanbul Coverage
         with:
           path: |
             ./console
-          key: ${{ runner.os }}-binary-${{ github.run_id }}
+          key: ${{ runner.os }}-binary-istanbul-coverage-${{ github.run_id }}
 
       - name: Start Console, front-end app and initialize users/policies
         run: |
           (./console server) & (make initialize-permissions)
 
-      - name: Start Browser at port 5005
-        run: |
-          echo "yarn playwright"
-          (cd $GITHUB_WORKSPACE/portal-ui; yarn playwright) & (sleep 120) # To start port 5005 with Istanbul Plugin Injected
-
       - name: Run Playwright tests
         run: |
           echo "Run tests under playwright folder only"
