ci: separate codebuild & cci differences (#12751)

aws-amplify · Jun 6, 2023 · 756db0f · 756db0f
1 parent fcfebe1
commit 756db0f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.circleci/local_publish_helpers.sh b/.circleci/local_publish_helpers.sh
@@ -267,8 +267,19 @@ function setAwsAccountCredentials {
         useChildAccountCredentials
     fi
 }
-
 function runE2eTest {
+    FAILED_TEST_REGEX_FILE="./amplify-e2e-reports/amplify-e2e-failed-test.txt"
+
+    if [ -f  $FAILED_TEST_REGEX_FILE ]; then
+        # read the content of failed tests
+        failedTests=$(<$FAILED_TEST_REGEX_FILE)
+        yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
+    else
+        yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
+    fi
+}
+
+function runE2eTestCb {
     _setupCoverage
     FAILED_TEST_REGEX_FILE="./amplify-e2e-reports/amplify-e2e-failed-test.txt"
 

diff --git a/codebuild_specs/scripts-windows/run-e2e-windows.sh b/codebuild_specs/scripts-windows/run-e2e-windows.sh
@@ -20,4 +20,4 @@ cd packages/amplify-e2e-tests
 
 _loadTestAccountCredentials
 
-retry runE2eTest
+retry runE2eTestCb
diff --git a/shared-scripts.sh b/shared-scripts.sh
@@ -289,7 +289,7 @@ function _runE2ETestsLinux {
     amplify version
     cd packages/amplify-e2e-tests
     _loadTestAccountCredentials
-    retry runE2eTest
+    retry runE2eTestCb
 }
 function _unassumeTestAccountCredentials {
     echo "Unassume Role"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ cd packages/amplify-e2e-tests

		_loadTestAccountCredentials

		retry runE2eTest
		retry runE2eTestCb