isolate b2b for testing in ci

sdrozdsap · sdrozdsap · commit ebad1ee64151 · 2025-05-14T11:02:01.000+02:00
diff --git a/.github/workflows/ci-merge-checks.yml b/.github/workflows/ci-merge-checks.yml
@@ -47,111 +47,6 @@ jobs:
         run: |
           source ci-scripts/validate-e2e-execution.sh
           echo "::set-output name=SHOULD_RUN_E2E::$(echo $RUN_E2E)"
-  b2c_e2e_tests:
-    needs: [no_retries, validate_e2e_execution]
-    name: MC - E2E B2C core
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        containers: [1, 2, 3, 4, 5]
-    if: ${{ needs.validate_e2e_execution.outputs.SHOULD_RUN_E2E == 'true' }}
-    steps:
-      - name: Forcefully fail build if e2e job is retried
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
-        if: ${{ github.run_attempt > 1 }}
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-      - name: Cache node_modules
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            projects/storefrontapp-e2e-cypress/node_modules
-            ~/.cache/Cypress
-          key: nodemodules-${{ github.event.pull_request.base.sha }}
-          restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
-      - name: Run e2es
-        env:
-          SPA_ENV: ci,b2c
-          BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
-        run: |
-          ci-scripts/e2e-cypress.sh
-  b2c_ssr_e2e_tests:
-    needs: [no_retries, validate_e2e_execution]
-    name: MC - E2E SSR core (B2C)
-    runs-on: ubuntu-latest
-    if: ${{ needs.validate_e2e_execution.outputs.SHOULD_RUN_E2E == 'true' }}
-    steps:
-      - name: Forcefully fail build if e2e job is retried
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
-        if: ${{ github.run_attempt > 1 }}
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-      - name: Cache node_modules
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            projects/storefrontapp-e2e-cypress/node_modules
-            ~/.cache/Cypress
-          key: nodemodules-${{ github.event.pull_request.base.sha }}
-          restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
-      - name: Run e2es
-        env:
-          SPA_ENV: ci,b2c
-          BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
-        run: |
-          ci-scripts/e2e-cypress.sh --ssr
-  b2b_e2e_tests:
-    needs: [no_retries, validate_e2e_execution]
-    name: MC - E2E B2B core
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        containers: [1, 2, 3, 4]
-    if: ${{ needs.validate_e2e_execution.outputs.SHOULD_RUN_E2E == 'true' }}
-    steps:
-      - name: Forcefully fail build if e2e job is retried
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
-        if: ${{ github.run_attempt > 1 }}
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-      - name: Cache node_modules
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            projects/storefrontapp-e2e-cypress/node_modules
-            ~/.cache/Cypress
-          key: nodemodules-${{ github.event.pull_request.base.sha }}
-          restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
-      - name: Run e2es
-        env:
-          SPA_ENV: ci,b2b
-          BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
-        run: |
-          ci-scripts/e2e-cypress.sh -s b2b
   a11y_e2e_tests:
     needs: [no_retries, validate_e2e_execution]
     name: MC - E2E A11Y (B2C & B2B)
@@ -184,12 +79,12 @@ jobs:
           restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
       - name: Run e2es
         env:
-          SPA_ENV: ci,b2c
+          SPA_ENV: ci,b2b
           BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
         run: |
           ci-scripts/e2e-cypress.sh -s a11y
   merge_checks_result:
-    needs: [b2c_e2e_tests, b2c_ssr_e2e_tests, b2b_e2e_tests, a11y_e2e_tests]
+    needs: [a11y_e2e_tests]
     name: MC - Result
     runs-on: ubuntu-latest
     if: ${{ always() }}
@@ -208,7 +103,4 @@ jobs:
             })
             core.setFailed('Please push a commit to re-trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
         if: |
-          needs.b2c_e2e_tests.result == 'failure' || needs.b2c_e2e_tests.result == 'cancelled' ||
-          needs.b2c_ssr_e2e_tests.result == 'failure' || needs.b2c_ssr_e2e_tests.result == 'cancelled' ||
-          needs.b2b_e2e_tests.result == 'failure' || needs.b2b_e2e_tests.result == 'cancelled' ||
-          needs.a11y_e2e_tests.result == 'failure' || needs.a11y_e2e_tests.result == 'cancelled'
+          needs.a11y_e2e_tests.result == 'failure' || needs.a11y_e2e_tests.result == 'cancelled'
diff --git a/ci-scripts/e2e-cypress.sh b/ci-scripts/e2e-cypress.sh
@@ -25,13 +25,13 @@ display_a11y_docs_link() {
 # Function to run a11y tests and print documentation link if they fail
 run_a11y_tests_with_docs_on_failure() {
     # B2C a11y tests
-    echo "Running a11y tests for B2C site"
-    if npm run e2e:run:ci:a11y; then
-        B2C_RESULT=0
-    else
-        display_a11y_docs_link
-        B2C_RESULT=1
-    fi
+    # echo "Running a11y tests for B2C site"
+    # if npm run e2e:run:ci:a11y; then
+    #     B2C_RESULT=0
+    # else
+    #     display_a11y_docs_link
+    #     B2C_RESULT=1
+    # fi
 
     # B2B a11y tests
     echo "Running a11y tests for B2B site"
