Skip to content

Commit d2c2fe8

Browse files
authored
Merge pull request #14192 from aws-amplify/gen2-migrations-execute
Gen2 migrations execute
2 parents 8a0f334 + 1ee3c31 commit d2c2fe8

3 files changed

Lines changed: 79 additions & 1 deletion

File tree

.circleci/local_publish_helpers_codebuild.sh

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,29 @@ function runE2eTestCb {
297297
fi
298298
}
299299

300+
function runGen2MigrationsE2ETestCb {
301+
_setupCoverage
302+
FAILED_TEST_REGEX_FILE="./amplify-migration-e2e-reports/amplify-migration-e2e-failed-test.txt"
303+
304+
if [ -f $FAILED_TEST_REGEX_FILE ]; then
305+
# read the content of failed tests
306+
failedTests=$(<$FAILED_TEST_REGEX_FILE)
307+
if [[ ! -z "$DISABLE_COVERAGE" ]]; then
308+
echo Running WITHOUT coverage
309+
yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
310+
else
311+
NODE_V8_COVERAGE=$E2E_TEST_COVERAGE_DIR yarn e2e-migration --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
312+
fi
313+
else
314+
if [[ ! -z "$DISABLE_COVERAGE" ]]; then
315+
echo Running WITHOUT coverage
316+
yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
317+
else
318+
NODE_V8_COVERAGE=$E2E_TEST_COVERAGE_DIR yarn e2e-migration --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
319+
fi
320+
fi
321+
}
322+
300323
function _setupCoverage {
301324
_teardownCoverage
302325
echo "Setup Coverage ($E2E_TEST_COVERAGE_DIR)"
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
version: 0.2
2+
env:
3+
shell: bash
4+
variables:
5+
E2E_TEST_COVERAGE_DIR: node_v8_coverage
6+
CI: true
7+
CIRCLECI: true
8+
IS_AMPLIFY_CI: true
9+
# mock values to test artifact scanning
10+
ENV_VAR_WITH_SECRETS: 'MOCK_ENV_VAR_FOR_SCANNING_SECRETS'
11+
MOCK_ENV_VAR_FOR_SCANNING_SECRETS: 'abc123xyz'
12+
13+
# mock values for credentials below
14+
FACEBOOK_APP_ID: 'fbAppId'
15+
FACEBOOK_APP_SECRET: 'fbAppSecret'
16+
GOOGLE_APP_ID: 'gglAppID'
17+
GOOGLE_APP_SECRET: 'gglAppSecret'
18+
AMAZON_APP_ID: 'amaznAppID'
19+
AMAZON_APP_SECRET: 'amaznAppID'
20+
APPLE_APP_ID: 'com.fake.app'
21+
APPLE_TEAM_ID: '2QLEWNDK6K'
22+
APPLE_KEY_ID: '2QLZXKYJ8J'
23+
# mock value, Cognito validates the private key, this is an invalidated key.
24+
APPLE_PRIVATE_KEY_2: '----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----'
25+
phases:
26+
build:
27+
commands:
28+
# you can provide a codebuild source version to use old cache and skip all other jobs :)
29+
- export NODE_OPTIONS=--max-old-space-size=4096
30+
- export AMPLIFY_DIR=$CODEBUILD_SRC_DIR/out
31+
- export AMPLIFY_PATH=$CODEBUILD_SRC_DIR/out/amplify-pkg-linux-x64
32+
- echo $AMPLIFY_DIR
33+
- echo $AMPLIFY_PATH
34+
- npm install -g ts-node
35+
- source ./shared-scripts.sh && _runGen2MigrationE2ETestsLinux
36+
post_build:
37+
commands:
38+
- source ./shared-scripts.sh && _convertCoverage # && _uploadCoverageLinux (disabled while troubleshooting E2E test failures during initial CodeBuild setup)
39+
- source ./shared-scripts.sh && _scanArtifacts
40+
- source ./shared-scripts.sh && _uploadReportsToS3 $CODEBUILD_SOURCE_VERSION $CODEBUILD_BATCH_BUILD_IDENTIFIER amplify-migration-e2e
41+
artifacts:
42+
files:
43+
- '$E2E_TEST_COVERAGE_DIR/*'
44+
- amplify-migration-e2e-reports/*
45+
base-directory: packages/amplify-migration-e2e/
46+
reports:
47+
e2e-reports:
48+
files:
49+
- '*.xml'
50+
file-format: 'JUNITXML'
51+
base-directory: '$CODEBUILD_SRC_DIR/packages/amplify-migration-e2e/junit'
52+
e2e-coverage-report:
53+
files:
54+
- 'packages/amplify-migration-e2e/coverage/clover.xml'
55+
file-format: CLOVERXML

shared-scripts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ function _runGen2MigrationE2ETestsLinux {
367367
amplify version
368368
cd packages/amplify-migration-e2e
369369
_loadTestAccountCredentials
370-
retry runE2eTestCb
370+
retry runGen2MigrationsE2ETestCb
371371
}
372372

373373
function _unassumeTestAccountCredentials {

0 commit comments

Comments
 (0)