Skip to content
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

ci: split some migration tests, fix retry issues, remove per-job cleanup #8340

Merged
merged 15 commits into from
Oct 5, 2021
+2,315 −2,229
Merged

ci: split some migration tests, fix retry issues, remove per-job cleanup #8340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7f72ba9
chore: add cloud-e2e script
edwardfoyle Oct 1, 2021
dec7819
chore(release): Publish [ci skip]
Oct 1, 2021
4ce98aa
ci: split migration tests
johnpc Oct 1, 2021
699e2de
Merge branch 'master' of github.com:aws-amplify/amplify-cli into para…
johnpc Oct 1, 2021
6fced41
Merge remote-tracking branch 'origin' into parallel-migration-e2e
johnpc Oct 1, 2021
af14405
ci: remove per-job cleanup
edwardfoyle Oct 3, 2021
c00f7e5
ci: only setAwsAccountCredentials once
johnpc Oct 4, 2021
19015b1
Merge branch 'master' of github.com:aws-amplify/amplify-cli into para…
johnpc Oct 4, 2021
347018f
ci: update migration test split
edwardfoyle Oct 4, 2021
c0f9906
Merge branch 'cleanup-fix' into parallel-migration-e2e
edwardfoyle Oct 4, 2021
a82519f
ci: don't re-initialize test on retry
edwardfoyle Oct 4, 2021
46c6e15
ci: remove retries from migration tests as new account is not checked…
edwardfoyle Oct 4, 2021
3dc6938
ci: move credentials switch inside retry loop
edwardfoyle Oct 4, 2021
27e40c3
ci: set default suite name in metric if not set
edwardfoyle Oct 4, 2021
b1cb9e5
ci: remove v 4.30 tests from split script
edwardfoyle Oct 5, 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
38 changes: 19 additions & 19 deletions .circleci/config.base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ jobs:
name: Run GraphQL end-to-end tests
command: |
source .circleci/local_publish_helpers.sh
setAwsAccountCredentials
cd packages/graphql-transformers-e2e-tests/
retry yarn e2e --maxWorkers=3 $TEST_SUITE
environment:
Expand Down Expand Up @@ -288,8 +287,9 @@ jobs:
path: packages/amplify-e2e-tests/
- store_artifacts:
path: packages/amplify-e2e-tests/amplify-e2e-reports
- clean_e2e_resources:
os: << parameters.os >>
# - clean_e2e_resources:
# os: << parameters.os >>

amplify_migration_tests_v4:
<<: *defaults
steps:
Expand All @@ -305,7 +305,7 @@ jobs:
source .circleci/local_publish_helpers.sh
changeNpmGlobalPath
cd packages/amplify-migration-tests
yarn run migration_v4.0.0 --maxWorkers=3 $TEST_SUITE
retry yarn run migration_v4.0.0 --maxWorkers=3 $TEST_SUITE
no_output_timeout: 90m
- run: *scan_e2e_test_artifacts
- store_test_results:
Expand Down Expand Up @@ -412,7 +412,7 @@ jobs:
source .circleci/local_publish_helpers.sh
changeNpmGlobalPath
cd packages/amplify-migration-tests
yarn run migration --maxWorkers=3 $TEST_SUITE
retry yarn run migration --maxWorkers=3 $TEST_SUITE
no_output_timeout: 90m
- run: *scan_e2e_test_artifacts
- store_test_results:
Expand Down Expand Up @@ -767,8 +767,8 @@ workflows:
- cleanup-resources
- e2e-auth-credentials
- e2e-test-context
post-steps:
- run: *clean_e2e_resources
# post-steps:
# - run: *clean_e2e_resources
filters:
branches:
only:
Expand Down Expand Up @@ -805,8 +805,8 @@ workflows:
- /run-e2e\/.*/
requires:
- build
post-steps:
- run: *clean_e2e_resources
# post-steps:
# - run: *clean_e2e_resources
- amplify_migration_tests_v4:
context:
- amplify-ecr-image-pull
Expand All @@ -821,8 +821,8 @@ workflows:
- /run-e2e\/.*/
requires:
- build
post-steps:
- run: *clean_e2e_resources
# post-steps:
# - run: *clean_e2e_resources
- amplify_migration_tests_v4_30_0:
context:
- amplify-ecr-image-pull
Expand All @@ -837,8 +837,8 @@ workflows:
- /run-e2e\/.*/
requires:
- build
post-steps:
- run: *clean_e2e_resources
# post-steps:
# - run: *clean_e2e_resources
- amplify_migration_tests_non_multi_env_layers:
context:
- amplify-ecr-image-pull
Expand All @@ -853,8 +853,8 @@ workflows:
- /run-e2e\/.*/
requires:
- build
post-steps:
- run: *clean_e2e_resources
# post-steps:
# - run: *clean_e2e_resources
- amplify_migration_tests_multi_env_layers:
context:
- amplify-ecr-image-pull
Expand All @@ -869,17 +869,17 @@ workflows:
- /run-e2e\/.*/
requires:
- build
post-steps:
- run: *clean_e2e_resources
# post-steps:
# - run: *clean_e2e_resources
- amplify_console_integration_tests:
context:
- amplify-ecr-image-pull
- e2e-auth-credentials
- cleanup-resources
- console-e2e-test
- e2e-test-context
post-steps:
- run: *clean_e2e_resources
# post-steps:
# - run: *clean_e2e_resources
filters:
branches:
only:
Expand Down
Loading