fixup! test: run legacy-cli e2e tests via bazel

angular · Nov 7, 2022 · 37c127d · 37c127d
1 parent d0aafda
commit 37c127d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.circleci/dynamic_config.yml b/.circleci/dynamic_config.yml
@@ -71,7 +71,7 @@ executors:
         type: string
         default: *default_nodeversion
     docker:
-      - image: cimg/node:<< parameters.nodeversion >>
+      - image: cimg/node:<< parameters.nodeversion >>-browsers
     working_directory: ~/ng
     resource_class: xlarge
 
@@ -300,7 +300,6 @@ jobs:
         default: *default_nodeversion_major
     steps:
       - custom_attach_workspace
-      - browser-tools/install-chrome
       - setup_bazel_rbe
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
       - when:
@@ -340,13 +339,12 @@ jobs:
         default: 'npm'
     steps:
       - custom_attach_workspace
-      - browser-tools/install-chrome
       - initialize_env
       - setup_bazel_rbe
       - run: mkdir /mnt/ramdisk/e2e
       - run:
           name: Test << parameters.build_type >> << parameters.subset >>
-          command: yarn bazel test --define E2E_TEMP=/mnt/ramdisk/e2e --define E2E_SHARD_TOTAL=${CIRCLE_NODE_TOTAL} --define E2E_SHARD=${CIRCLE_NODE_INDEX} --config=<< parameters.build_type >> //tests/legacy-cli:e2e.<< parameters.subset >>
+          command: yarn bazel test --define=E2E_TEMP=/mnt/ramdisk/e2e --define=E2E_SHARD_TOTAL=${CIRCLE_NODE_TOTAL} --define=E2E_SHARD_INDEX=${CIRCLE_NODE_INDEX} --config=<< parameters.build_type >> //tests/legacy-cli:e2e.<< parameters.subset >>
           no_output_timeout: 40m
       - store_artifacts:
           path: dist/testlogs/tests/legacy-cli/e2e.<< parameters.subset >>
@@ -483,7 +481,7 @@ jobs:
             PWD: .
           command: |
             mkdir X:/ramdisk/e2e
-            bazel test --define=E2E_TEMP=X:/ramdisk/e2e --define=E2E_SHARD_TOTAL=$env:CIRCLE_NODE_TOTAL --define=E2E_SHARD=$env:CIRCLE_NODE_INDEX --config=e2e //tests/legacy-cli:e2e.npm
+            bazel test --define=E2E_TEMP=X:/ramdisk/e2e --define=E2E_SHARD_TOTAL=$env:CIRCLE_NODE_TOTAL --define=E2E_SHARD_INDEX=$env:CIRCLE_NODE_INDEX --config=e2e //tests/legacy-cli:e2e.npm
           # This timeout provides time for the actual tests to timeout and report status
           # instead of CircleCI stopping the job without test failure information.
           no_output_timeout: 40m

diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
@@ -70,7 +70,7 @@ const argv = yargsParser(process.argv.slice(2), {
     'shard':
       process.env.E2E_SHARD_INDEX === undefined && process.env.TEST_SHARD_INDEX === undefined
         ? undefined
-        : Number(process.env.E2E_SHARD_INDEX ?? 0) * Number(process.env.E2E_SHARD_TOTAL ?? 1) +
+        : Number(process.env.E2E_SHARD_INDEX ?? 0) * Number(process.env.TEST_TOTAL_SHARDS ?? 1) +
           Number(process.env.TEST_SHARD_INDEX ?? 0),
   },
 });