Skip to content

ci: use CircleCI matrix support for E2E jobs #20143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clydin merged 2 commits into from
Feb 26, 2021
Merged

ci: use CircleCI matrix support for E2E jobs #20143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1af5118
ci: use CircleCI matrix support for E2E jobs
clydin Feb 25, 2021
53e3b1e
ci: move npm prefix config to env helper script
clydin Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 28 additions & 40 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ executors:
docker:
- image: cimg/node:<< parameters.nodeversion >>
working_directory: ~/ng
environment:
NPM_CONFIG_PREFIX: ~/.npm-global
resource_class: large

windows-executor:
Expand Down Expand Up @@ -179,13 +177,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
Expand All @@ -197,25 +200,12 @@ jobs:
name: Execute CLI E2E Tests
command: |
mkdir /mnt/ramdisk/e2e-main
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 >> --tmpdir=/mnt/ramdisk/e2e-main
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 >> --tmpdir=/mnt/ramdisk/e2e-main
- run:
name: Execute CLI E2E Tests Subset with Yarn
command: |
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}
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/**}"

test-browsers:
executor:
Expand All @@ -238,8 +228,8 @@ jobs:
# Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
# too early without Saucelabs not being ready.
- run: ./scripts/saucelabs/wait-for-tunnel.sh
- run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts --ve
- run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts
- run: node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts --ve
- run: node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts
- run: ./scripts/saucelabs/stop-tunnel.sh

build:
Expand Down Expand Up @@ -334,20 +324,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:
Expand All @@ -356,17 +353,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
Expand Down
2 changes: 2 additions & 0 deletions .circleci/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ echo "source $envHelpersPath;" >> $BASH_ENV;
# See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info.
####################################################################################################
setPublicVar PROJECT_ROOT "$projectDir";
setPublicVar NPM_CONFIG_PREFIX "${HOME}/.npm-global";
setPublicVar PATH "${HOME}/.npm-global/bin:${PATH}";

####################################################################################################
# Define SauceLabs environment variables for CircleCI.
Expand Down