[CI] Remove unneeded parameterization and increase parallelism (#7310)

* remove unneeded parameterization and increase parallelism

* wrong scripts

* rename

* refactor: rename job

* fix: woops

---------

Co-authored-by: Jesse Mazzella <jesse.d.mazzella@nasa.gov>
This commit is contained in:
John Hill 2023-12-18 16:48:13 -08:00 committed by GitHub
parent 3fccac0bfc
commit 0ce36c8297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -120,15 +120,13 @@ jobs:
- generate_and_store_version_and_filesystem_artifacts - generate_and_store_version_and_filesystem_artifacts
e2e-test: e2e-test:
parameters: parameters:
node-version:
type: string
suite: #stable or full suite: #stable or full
type: string type: string
executor: pw-focal-development executor: pw-focal-development
parallelism: 4 parallelism: 6
steps: steps:
- build_and_install: - build_and_install:
node-version: <<parameters.node-version>> node-version: lts/hydrogen
- when: #Only install chrome-beta when running the 'full' suite to save $$$ - when: #Only install chrome-beta when running the 'full' suite to save $$$
condition: condition:
equal: ['full', <<parameters.suite>>] equal: ['full', <<parameters.suite>>]
@ -155,13 +153,10 @@ jobs:
steps: steps:
- generate_and_store_version_and_filesystem_artifacts - generate_and_store_version_and_filesystem_artifacts
e2e-couchdb: e2e-couchdb:
parameters:
node-version:
type: string
executor: ubuntu executor: ubuntu
steps: steps:
- build_and_install: - build_and_install:
node-version: <<parameters.node-version>> node-version: lts/hydrogen
- run: npx playwright@1.39.0 install #Necessary for bare ubuntu machine - run: npx playwright@1.39.0 install #Necessary for bare ubuntu machine
- run: | - run: |
export $(cat src/plugins/persistence/couch/.env.ci | xargs) export $(cat src/plugins/persistence/couch/.env.ci | xargs)
@ -189,15 +184,28 @@ jobs:
equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2 equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
steps: steps:
- generate_and_store_version_and_filesystem_artifacts - generate_and_store_version_and_filesystem_artifacts
perf-test: mem-test:
parameters:
node-version:
type: string
executor: pw-focal-development executor: pw-focal-development
steps: steps:
- build_and_install: - build_and_install:
node-version: <<parameters.node-version>> node-version: lts/hydrogen
- run: npm run test:perf:memory - run: npm run test:perf:memory
- store_test_results:
path: test-results/results.xml
- store_artifacts:
path: test-results
- store_artifacts:
path: html-test-results
- when:
condition:
equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
steps:
- generate_and_store_version_and_filesystem_artifacts
perf-test:
executor: pw-focal-development
steps:
- build_and_install:
node-version: lts/hydrogen
- run: npm run test:perf:localhost - run: npm run test:perf:localhost
- run: npm run test:perf:contract - run: npm run test:perf:contract
- store_test_results: - store_test_results:
@ -213,14 +221,12 @@ jobs:
- generate_and_store_version_and_filesystem_artifacts - generate_and_store_version_and_filesystem_artifacts
visual-test: visual-test:
parameters: parameters:
node-version:
type: string
suite: suite:
type: string # ci or full type: string # ci or full
executor: pw-focal-development executor: pw-focal-development
steps: steps:
- build_and_install: - build_and_install:
node-version: <<parameters.node-version>> node-version: lts/hydrogen
- run: npm run test:e2e:visual:<<parameters.suite>> - run: npm run test:e2e:visual:<<parameters.suite>>
- store_test_results: - store_test_results:
path: test-results/results.xml path: test-results/results.xml
@ -244,14 +250,12 @@ workflows:
node-version: lts/hydrogen node-version: lts/hydrogen
- e2e-test: - e2e-test:
name: e2e-stable name: e2e-stable
node-version: lts/hydrogen
suite: stable suite: stable
- perf-test: - mem-test
node-version: lts/hydrogen - perf-test
- visual-test: - visual-test:
name: visual-test-ci name: visual-test-ci
suite: ci suite: ci
node-version: lts/hydrogen
the-nightly: #These jobs do not run on PRs, but against master at night the-nightly: #These jobs do not run on PRs, but against master at night
jobs: jobs:
@ -265,16 +269,13 @@ workflows:
node-version: lts/hydrogen node-version: lts/hydrogen
- e2e-test: - e2e-test:
name: e2e-full-nightly name: e2e-full-nightly
node-version: lts/hydrogen
suite: full suite: full
- perf-test: - mem-test
node-version: lts/hydrogen - perf-test
- visual-test: - visual-test:
name: visual-test-nightly name: visual-test-nightly
suite: full suite: full
node-version: lts/hydrogen - e2e-couchdb
- e2e-couchdb:
node-version: lts/hydrogen
triggers: triggers:
- schedule: - schedule:
cron: '0 0 * * *' cron: '0 0 * * *'