ci: use CircleCI matrix support for E2E jobs

Author: clydin

.circleci/config.yml

@@ -179,13 +179,18 @@ jobs:
 
   e2e-cli:
     parameters:
+      nodeversion:
+        type: string
+        default: *default_nodeversion
       ve:
         type: boolean
         default: false
       snapshots:
         type: boolean
         default: false
-    executor: test-executor
+    executor:
+      name: test-executor
+      nodeversion: << parameters.nodeversion >>
     parallelism: 6
     steps:
       - custom_attach_workspace
@@ -204,19 +209,6 @@ jobs:
             mkdir /mnt/ramdisk/e2e-yarn
             PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk/e2e-yarn --glob="{tests/basic/**,tests/update/**}"
 
-  e2e-cli-node-14:
-    executor:
-      name: test-executor
-      nodeversion: "14.15"
-    parallelism: 6
-    steps:
-      - custom_attach_workspace
-      - browser-tools/install-chrome
-      - run:
-          name: Initialize Environment
-          command: ./.circleci/env.sh
-      - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
-
   test-browsers:
     executor:
       name: test-executor
@@ -334,20 +326,27 @@ workflows:
           requires:
             - setup
       - e2e-cli:
+          name: e2e-cli<<# matrix.ve >>-ve<</ matrix.ve >>
+          matrix:
+            alias: e2e-cli-renderers
+            parameters:
+              ve: [true, false]
           post-steps:
-            - store_artifacts:
-                path: /tmp/dist
-                destination: cli/new-production
+            - unless:
+                condition: << matrix.ve >>
+                steps:
+                  - store_artifacts:
+                      path: /tmp/dist
+                      destination: cli/new-production
           requires:
             - build
       - e2e-cli:
-          name: e2e-cli-ve
-          ve: true
-          requires:
-            - build
-      - e2e-cli:
-          name: e2e-cli-ng-snapshots
+          name: e2e-cli-ng<<# matrix.ve >>-ve<</ matrix.ve >>-snapshots
           snapshots: true
+          matrix:
+            alias: e2e-cli-renderers-snapshots
+            parameters:
+              ve: [true, false]
           requires:
             - e2e-cli
           filters:
@@ -356,17 +355,8 @@ workflows:
                 - renovate/angular
                 - master
       - e2e-cli:
-          name: e2e-cli-ng-ve-snapshots
-          snapshots: true
-          ve: true
-          requires:
-            - e2e-cli
-          filters:
-            branches:
-              only:
-                - renovate/angular
-                - master
-      - e2e-cli-node-14:
+          name: e2e-cli-node-14
+          nodeversion: "14.15"
           <<: *only_release_branches
           requires:
             - e2e-cli