From a385fb7b2303eff09dd83897d3feaabb2cde9ba9 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 20 May 2024 13:39:46 +0100 Subject: [PATCH 1/5] Changes post cherry-pick --- .github/workflows/build-and-upload-branch.yaml | 3 +-- .github/workflows/test.yaml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-upload-branch.yaml b/.github/workflows/build-and-upload-branch.yaml index c937ae15efe..f02f5a5868a 100644 --- a/.github/workflows/build-and-upload-branch.yaml +++ b/.github/workflows/build-and-upload-branch.yaml @@ -2,8 +2,7 @@ name: Build Dashboard (Branch) on: push: branches: - - 'release-2.8*' - - '*-dev' + - 'release-2.8.patch1' jobs: build-validation: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2cc1e60867e..e740a17bf42 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -2,10 +2,10 @@ name: Tests on: push: branches: - - 'release-2.8*' + - 'release-2.8.patch1' pull_request: branches: - - 'release-2.8*' + - 'release-2.8.patch1' workflow_dispatch: inputs: environment: From 7630039848f9b6e38bb067ead6eef2208de02bc5 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 20 May 2024 13:42:56 +0100 Subject: [PATCH 2/5] WIP --- .github/workflows/build-and-upload-branch.yaml | 4 +++- .github/workflows/build-and-upload-release-2-8.yaml | 1 + .github/workflows/test.yaml | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-upload-branch.yaml b/.github/workflows/build-and-upload-branch.yaml index f02f5a5868a..2a47c022133 100644 --- a/.github/workflows/build-and-upload-branch.yaml +++ b/.github/workflows/build-and-upload-branch.yaml @@ -2,7 +2,9 @@ name: Build Dashboard (Branch) on: push: branches: - - 'release-2.8.patch1' + - release-2.8.patch1 + # TODO: RC remove + - richard-cox-2.8.patch1-drone jobs: build-validation: diff --git a/.github/workflows/build-and-upload-release-2-8.yaml b/.github/workflows/build-and-upload-release-2-8.yaml index 79bdb02031e..b16294e0fe1 100644 --- a/.github/workflows/build-and-upload-release-2-8.yaml +++ b/.github/workflows/build-and-upload-release-2-8.yaml @@ -3,6 +3,7 @@ on: push: tags: - v2.8.* + - richard-cox-2.8.patch1-drone-tag jobs: build-validation: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e740a17bf42..a1011f366a7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -2,10 +2,10 @@ name: Tests on: push: branches: - - 'release-2.8.patch1' + - release-2.8.patch1 pull_request: branches: - - 'release-2.8.patch1' + - release-2.8.patch1 workflow_dispatch: inputs: environment: From 07c6da004efc803d04ce4661c3503bf66dd4b7e1 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 20 May 2024 13:56:34 +0100 Subject: [PATCH 3/5] Remove e2e matrix (requires lots of tag updates) --- .github/workflows/test.yaml | 44 ++++++++++++++----------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a1011f366a7..d138d8ba37e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -61,22 +61,6 @@ jobs: e2e-test: if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')" needs: e2e-ui-build - strategy: - fail-fast: false - matrix: - role: [ - { username: 'admin', tag: '@adminUser' }, - { username: 'standard_user', tag: '@standardUser' } - ] - features: [ - ['@navigation', '@extensions'], - ['@charts'], - ['@explorer'], - ['@fleet'], - ['@generic', '@globalSettings'], - ['@manager'], - ['@userMenu', '@usersAndAuths'] - ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -100,6 +84,7 @@ jobs: with: name: ${{ env.E2E_BUILD_DIST_NAME }} path: ${{ env.E2E_BUILD_DIST_DIR }} + - name: Download e2e build ember uses: actions/download-artifact@v4 with: @@ -109,28 +94,33 @@ jobs: - name: Run Rancher run: yarn e2e:docker - - name: Setup Rancher and user + - name: Run admin user tests run: | yarn e2e:prod + mkdir -p coverage-artifacts/coverage + cp coverage/e2e/coverage-final.json coverage-artifacts/coverage/coverage-e2e.json + cp -r coverage/e2e/ coverage-artifacts/coverage/e2e/ env: - GREP_TAGS: ${{ matrix.role.tag }}Setup+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}Setup+${{ matrix.features[1] || matrix.features[0] }} --@jenkins + GREP_TAGS: '@adminUser' TEST_USERNAME: admin - TEST_ONLY: setup - - - name: Run user tests + + + - name: Run standard user tests + if: ${{ success() || failure() }} run: | yarn e2e:prod - [ "$BUILD_DASHBOARD" != "false" ] || exit 0 + yarn docker:local:stop + mkdir -p coverage-artifacts/coverage + cp coverage/e2e/coverage-final.json coverage-artifacts/coverage/coverage-e2e.json env: - TEST_SKIP: setup - GREP_TAGS: ${{ matrix.role.tag }}+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}+${{ matrix.features[1] || matrix.features[0] }} --@jenkins - TEST_USERNAME: ${{ matrix.role.username }} - + GREP_TAGS: '@standardUser' + TEST_USERNAME: standard_user + - name: Upload screenshots uses: actions/upload-artifact@v3 if: ${{ failure() }} with: - name: ${{github.run_number}}-${{github.run_attempt}}-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }} + name: ${{github.run_number}}-${{github.run_attempt}}-screenshots path: cypress/screenshots unit-test: From ee609e7ce544e1be4da4be7f5361730f85ff38a8 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 21 May 2024 14:31:09 +0100 Subject: [PATCH 4/5] remove test triggers --- .github/workflows/build-and-upload-branch.yaml | 2 -- .github/workflows/build-and-upload-release-2-8.yaml | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/build-and-upload-branch.yaml b/.github/workflows/build-and-upload-branch.yaml index 2a47c022133..2fe213ae04c 100644 --- a/.github/workflows/build-and-upload-branch.yaml +++ b/.github/workflows/build-and-upload-branch.yaml @@ -3,8 +3,6 @@ on: push: branches: - release-2.8.patch1 - # TODO: RC remove - - richard-cox-2.8.patch1-drone jobs: build-validation: diff --git a/.github/workflows/build-and-upload-release-2-8.yaml b/.github/workflows/build-and-upload-release-2-8.yaml index b16294e0fe1..79bdb02031e 100644 --- a/.github/workflows/build-and-upload-release-2-8.yaml +++ b/.github/workflows/build-and-upload-release-2-8.yaml @@ -3,7 +3,6 @@ on: push: tags: - v2.8.* - - richard-cox-2.8.patch1-drone-tag jobs: build-validation: From 6cab40a2d34725f30764059c331e1c9c3f0e4c42 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 30 May 2024 11:55:24 +0100 Subject: [PATCH 5/5] Fixes after merge --- .github/workflows/test.yaml | 43 +++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d138d8ba37e..f1c055a4d2b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -61,6 +61,22 @@ jobs: e2e-test: if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')" needs: e2e-ui-build + strategy: + fail-fast: false + matrix: + role: [ + { username: 'admin', tag: '@adminUser' }, + { username: 'standard_user', tag: '@standardUser' } + ] + features: [ + ['@navigation', '@extensions'], + ['@charts'], + ['@explorer'], + ['@fleet'], + ['@generic', '@globalSettings'], + ['@manager'], + ['@userMenu', '@usersAndAuths'] + ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -94,33 +110,28 @@ jobs: - name: Run Rancher run: yarn e2e:docker - - name: Run admin user tests + - name: Setup Rancher and user run: | yarn e2e:prod - mkdir -p coverage-artifacts/coverage - cp coverage/e2e/coverage-final.json coverage-artifacts/coverage/coverage-e2e.json - cp -r coverage/e2e/ coverage-artifacts/coverage/e2e/ env: - GREP_TAGS: '@adminUser' + GREP_TAGS: ${{ matrix.role.tag }}Setup+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}Setup+${{ matrix.features[1] || matrix.features[0] }} --@jenkins TEST_USERNAME: admin - - - - name: Run standard user tests - if: ${{ success() || failure() }} + TEST_ONLY: setup + + - name: Run user tests run: | yarn e2e:prod - yarn docker:local:stop - mkdir -p coverage-artifacts/coverage - cp coverage/e2e/coverage-final.json coverage-artifacts/coverage/coverage-e2e.json + [ "$BUILD_DASHBOARD" != "false" ] || exit 0 env: - GREP_TAGS: '@standardUser' - TEST_USERNAME: standard_user - + TEST_SKIP: setup + GREP_TAGS: ${{ matrix.role.tag }}+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}+${{ matrix.features[1] || matrix.features[0] }} --@jenkins + TEST_USERNAME: ${{ matrix.role.username }} + - name: Upload screenshots uses: actions/upload-artifact@v3 if: ${{ failure() }} with: - name: ${{github.run_number}}-${{github.run_attempt}}-screenshots + name: ${{github.run_number}}-${{github.run_attempt}}-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }} path: cypress/screenshots unit-test: