Merge remote-tracking branch 'origin' into parallel-migration-e2e

aws-amplify · Oct 1, 2021 · a92d0fa · a92d0fa
2 parents 699e2de + ca20fd3
commit a92d0fa
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 33 deletions.
diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
@@ -205,7 +205,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -245,7 +245,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9561,7 +9561,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9592,7 +9592,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9623,7 +9623,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9654,7 +9654,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9685,7 +9685,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9716,7 +9716,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9747,7 +9747,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9778,7 +9778,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9809,7 +9809,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9840,7 +9840,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9871,7 +9871,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9902,7 +9902,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9933,7 +9933,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9964,7 +9964,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -9995,7 +9995,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10026,7 +10026,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10057,7 +10057,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10088,7 +10088,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10119,7 +10119,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10150,7 +10150,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10181,7 +10181,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10212,7 +10212,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10243,7 +10243,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10274,7 +10274,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10305,7 +10305,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10336,7 +10336,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10367,7 +10367,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10398,7 +10398,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
@@ -10429,7 +10429,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             setAwsAccountCredentials
             cd packages/graphql-transformers-e2e-tests/
-            yarn e2e --maxWorkers=3 $TEST_SUITE
+            retry yarn e2e --maxWorkers=3 $TEST_SUITE
           environment:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m

diff --git a/.circleci/local_publish_helpers.sh b/.circleci/local_publish_helpers.sh
@@ -72,8 +72,7 @@ function useChildAccountCredentials {
 }
 
 retry() {
-    # TODO: Bump MAX_ATTEMPTS when there is more team buy-in to this strategy
-    MAX_ATTEMPTS=1
+    MAX_ATTEMPTS=2
     SLEEP_DURATION=5
     n=0
     until [ $n -ge $MAX_ATTEMPTS ]