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.

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

chore: log source version in e2e build log #13735

Closed
wants to merge 15 commits into from
13 changes: 9 additions & 4 deletions codebuild_specs/aggregate_e2e_reports.yml
Original file line number Diff line number Diff line change
@@ -11,12 +11,17 @@ phases:
- cd ..
- source ./shared-scripts.sh && _downloadReportsFromS3 $CODEBUILD_SOURCE_VERSION
- mkdir artifacts && echo "empty artifact" > artifacts/empty-artifact.txt
post_build:
commands:
- echo $PROJECT_NAME
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to write the repetitive code because after I used shared_script.sh in f0a4fcc, some builds couldn't find the file.

- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
reports:
e2e-reports:
files:
- '*.xml'
file-format: 'JUNITXML'
base-directory: '$CODEBUILD_SRC_DIR/aggregate_reports'
- "*.xml"
file-format: "JUNITXML"
base-directory: "$CODEBUILD_SRC_DIR/aggregate_reports"
artifacts:
files:
- 'artifacts/*'
- "artifacts/*"
34 changes: 19 additions & 15 deletions codebuild_specs/amplify_console_integration_tests.yml
Original file line number Diff line number Diff line change
@@ -8,28 +8,32 @@ env:
IS_AMPLIFY_CI: true
CLI_REGION: us-east-1
# mock values to test artifact scanning
ENV_VAR_WITH_SECRETS: 'MOCK_ENV_VAR_FOR_SCANNING_SECRETS'
MOCK_ENV_VAR_FOR_SCANNING_SECRETS: 'abc123xyz'
ENV_VAR_WITH_SECRETS: "MOCK_ENV_VAR_FOR_SCANNING_SECRETS"
MOCK_ENV_VAR_FOR_SCANNING_SECRETS: "abc123xyz"

# mock values for credentials below
FACEBOOK_APP_ID: 'fbAppId'
FACEBOOK_APP_SECRET: 'fbAppSecret'
GOOGLE_APP_ID: 'gglAppID'
GOOGLE_APP_SECRET: 'gglAppSecret'
AMAZON_APP_ID: 'amaznAppID'
AMAZON_APP_SECRET: 'amaznAppID'
APPLE_APP_ID: 'com.fake.app'
APPLE_TEAM_ID: '2QLEWNDK6K'
APPLE_KEY_ID: '2QLZXKYJ8J'
FACEBOOK_APP_ID: "fbAppId"
FACEBOOK_APP_SECRET: "fbAppSecret"
GOOGLE_APP_ID: "gglAppID"
GOOGLE_APP_SECRET: "gglAppSecret"
AMAZON_APP_ID: "amaznAppID"
AMAZON_APP_SECRET: "amaznAppID"
APPLE_APP_ID: "com.fake.app"
APPLE_TEAM_ID: "2QLEWNDK6K"
APPLE_KEY_ID: "2QLZXKYJ8J"
# mock value, Cognito validates the private key, this is an invalidated key.
APPLE_PRIVATE_KEY_2: '----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----'
APPLE_PRIVATE_KEY_2: "----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----"
phases:
build:
commands:
- source ./shared-scripts.sh && _amplifyConsoleIntegrationTests
post_build:
commands:
- source ./shared-scripts.sh && _scanArtifacts
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"

artifacts:
files:
@@ -38,6 +42,6 @@ artifacts:
reports:
e2e-reports:
files:
- '*.xml'
file-format: 'JUNITXML'
base-directory: '$CODEBUILD_SRC_DIR/packages/amplify-console-integration-tests/reports/junit'
- "*.xml"
file-format: "JUNITXML"
base-directory: "$CODEBUILD_SRC_DIR/packages/amplify-console-integration-tests/reports/junit"
6 changes: 5 additions & 1 deletion codebuild_specs/amplify_general_config_tests.yml
Original file line number Diff line number Diff line change
@@ -10,6 +10,10 @@ phases:
build:
commands:
- source ./shared-scripts.sh && _amplifyGeneralConfigTests
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/amplify_install_test.yml
Original file line number Diff line number Diff line change
@@ -17,6 +17,12 @@ phases:
- npm install -g @aws-amplify/cli
- source .circleci/local_publish_helpers_codebuild.sh && unsetNpmRegistryUrl
- amplify version
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
34 changes: 19 additions & 15 deletions codebuild_specs/amplify_migration_tests_multi_env_layers.yml
Original file line number Diff line number Diff line change
@@ -8,21 +8,21 @@ env:
IS_AMPLIFY_CI: true
CLI_REGION: us-east-1
# mock values to test artifact scanning
ENV_VAR_WITH_SECRETS: 'MOCK_ENV_VAR_FOR_SCANNING_SECRETS'
MOCK_ENV_VAR_FOR_SCANNING_SECRETS: 'abc123xyz'
ENV_VAR_WITH_SECRETS: "MOCK_ENV_VAR_FOR_SCANNING_SECRETS"
MOCK_ENV_VAR_FOR_SCANNING_SECRETS: "abc123xyz"

# mock values for credentials below
FACEBOOK_APP_ID: 'fbAppId'
FACEBOOK_APP_SECRET: 'fbAppSecret'
GOOGLE_APP_ID: 'gglAppID'
GOOGLE_APP_SECRET: 'gglAppSecret'
AMAZON_APP_ID: 'amaznAppID'
AMAZON_APP_SECRET: 'amaznAppID'
APPLE_APP_ID: 'com.fake.app'
APPLE_TEAM_ID: '2QLEWNDK6K'
APPLE_KEY_ID: '2QLZXKYJ8J'
FACEBOOK_APP_ID: "fbAppId"
FACEBOOK_APP_SECRET: "fbAppSecret"
GOOGLE_APP_ID: "gglAppID"
GOOGLE_APP_SECRET: "gglAppSecret"
AMAZON_APP_ID: "amaznAppID"
AMAZON_APP_SECRET: "amaznAppID"
APPLE_APP_ID: "com.fake.app"
APPLE_TEAM_ID: "2QLEWNDK6K"
APPLE_KEY_ID: "2QLZXKYJ8J"
# mock value, Cognito validates the private key, this is an invalidated key.
APPLE_PRIVATE_KEY_2: '----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----'
APPLE_PRIVATE_KEY_2: "----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----"
phases:
build:
commands:
@@ -37,12 +37,16 @@ phases:
commands:
- source ./shared-scripts.sh && _scanArtifacts
- source ./shared-scripts.sh && _uploadReportsToS3 $CODEBUILD_SOURCE_VERSION $CODEBUILD_BATCH_BUILD_IDENTIFIER amplify-migration-tests
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
reports:
e2e-reports:
files:
- '*.xml'
file-format: 'JUNITXML'
base-directory: '$CODEBUILD_SRC_DIR/packages/amplify-migration-tests/reports/junit'
- "*.xml"
file-format: "JUNITXML"
base-directory: "$CODEBUILD_SRC_DIR/packages/amplify-migration-tests/reports/junit"
artifacts:
files:
- $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports/*
34 changes: 19 additions & 15 deletions codebuild_specs/amplify_migration_tests_non_multi_env_layers.yml
Original file line number Diff line number Diff line change
@@ -8,21 +8,21 @@ env:
IS_AMPLIFY_CI: true
CLI_REGION: us-east-1
# mock values to test artifact scanning
ENV_VAR_WITH_SECRETS: 'MOCK_ENV_VAR_FOR_SCANNING_SECRETS'
MOCK_ENV_VAR_FOR_SCANNING_SECRETS: 'abc123xyz'
ENV_VAR_WITH_SECRETS: "MOCK_ENV_VAR_FOR_SCANNING_SECRETS"
MOCK_ENV_VAR_FOR_SCANNING_SECRETS: "abc123xyz"

# mock values for credentials below
FACEBOOK_APP_ID: 'fbAppId'
FACEBOOK_APP_SECRET: 'fbAppSecret'
GOOGLE_APP_ID: 'gglAppID'
GOOGLE_APP_SECRET: 'gglAppSecret'
AMAZON_APP_ID: 'amaznAppID'
AMAZON_APP_SECRET: 'amaznAppID'
APPLE_APP_ID: 'com.fake.app'
APPLE_TEAM_ID: '2QLEWNDK6K'
APPLE_KEY_ID: '2QLZXKYJ8J'
FACEBOOK_APP_ID: "fbAppId"
FACEBOOK_APP_SECRET: "fbAppSecret"
GOOGLE_APP_ID: "gglAppID"
GOOGLE_APP_SECRET: "gglAppSecret"
AMAZON_APP_ID: "amaznAppID"
AMAZON_APP_SECRET: "amaznAppID"
APPLE_APP_ID: "com.fake.app"
APPLE_TEAM_ID: "2QLEWNDK6K"
APPLE_KEY_ID: "2QLZXKYJ8J"
# mock value, Cognito validates the private key, this is an invalidated key.
APPLE_PRIVATE_KEY_2: '----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----'
APPLE_PRIVATE_KEY_2: "----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----"
phases:
build:
commands:
@@ -37,12 +37,16 @@ phases:
commands:
- source ./shared-scripts.sh && _scanArtifacts
- source ./shared-scripts.sh && _uploadReportsToS3 $CODEBUILD_SOURCE_VERSION $CODEBUILD_BATCH_BUILD_IDENTIFIER amplify-migration-tests
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
reports:
e2e-reports:
files:
- '*.xml'
file-format: 'JUNITXML'
base-directory: '$CODEBUILD_SRC_DIR/packages/amplify-migration-tests/reports/junit'
- "*.xml"
file-format: "JUNITXML"
base-directory: "$CODEBUILD_SRC_DIR/packages/amplify-migration-tests/reports/junit"
artifacts:
files:
- $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports/*
8 changes: 7 additions & 1 deletion codebuild_specs/amplify_sudo_install_test.yml
Original file line number Diff line number Diff line change
@@ -13,6 +13,12 @@ phases:
- sudo npm install -g @aws-amplify/cli
- source .circleci/local_publish_helpers_codebuild.sh && unsetSudoNpmRegistryUrl
# - amplify version
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/build_linux.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ phases:
commands:
- ./.circleci/codebuild-checkout.sh
- source ./shared-scripts.sh && _buildLinux
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"

artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/build_pkg_binaries_arm.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ phases:
commands:
- source shared-scripts.sh && _waitForJobs publish_to_local_registry requirePrevJobsToSucceed
- source ./shared-scripts.sh && _buildBinaries arm
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"

artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/build_pkg_binaries_linux.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ phases:
commands:
- source shared-scripts.sh && _waitForJobs publish_to_local_registry requirePrevJobsToSucceed
- source ./shared-scripts.sh && _buildBinaries linux
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"

artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/build_pkg_binaries_macos.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ phases:
commands:
- source shared-scripts.sh && _waitForJobs publish_to_local_registry requirePrevJobsToSucceed
- source ./shared-scripts.sh && _buildBinaries macos
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"

artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/build_pkg_binaries_win.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ phases:
commands:
- source shared-scripts.sh && _waitForJobs publish_to_local_registry requirePrevJobsToSucceed
- source ./shared-scripts.sh && _buildBinaries win
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"

artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/build_tests_standalone.yml
Original file line number Diff line number Diff line change
@@ -6,6 +6,12 @@ phases:
commands:
- echo "Build Tests Standalone"
- source ./shared-scripts.sh && _buildTestsStandalone
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
9 changes: 7 additions & 2 deletions codebuild_specs/build_windows.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,12 @@ phases:
- yarn production-build
- yarn build-tests
- bash ./codebuild_specs/scripts-windows/save-build-windows.sh

post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
8 changes: 7 additions & 1 deletion codebuild_specs/cleanup_resources.yml
Original file line number Diff line number Diff line change
@@ -6,6 +6,12 @@ phases:
commands:
- npm install -g ts-node
- source ./shared-scripts.sh && _cleanUpResources
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
4 changes: 2 additions & 2 deletions codebuild_specs/e2e_workflow_base.yml
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ env:
AWS_DEFAULT_REGION: us-east-1
AWS_REGION: us-east-1
CDK_DEFAULT_REGION: us-east-1
AMPLIFY_DIR: '$CODEBUILD_SRC_DIR/out'
AMPLIFY_PATH: '$CODEBUILD_SRC_DIR/out/amplify-pkg-linux-x64'
AMPLIFY_DIR: "$CODEBUILD_SRC_DIR/out"
AMPLIFY_PATH: "$CODEBUILD_SRC_DIR/out/amplify-pkg-linux-x64"

batch:
fast-fail: false
6 changes: 6 additions & 0 deletions codebuild_specs/integration_test.yml
Original file line number Diff line number Diff line change
@@ -9,6 +9,12 @@ phases:
build:
commands:
- source ./shared-scripts.sh && _integrationTest
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- $CODEBUILD_SRC_DIR/../aws-amplify-cypress-auth/cypress/videos/*
8 changes: 7 additions & 1 deletion codebuild_specs/lint.yml
Original file line number Diff line number Diff line change
@@ -5,6 +5,12 @@ phases:
build:
commands:
- source ./shared-scripts.sh && _lint
post_build:
commands:
- echo "Build Status"
- echo $PROJECT_NAME
- echo $BRANCH_NAME
- echo "CODEBUILD_WEBHOOK_TRIGGER=$CODEBUILD_WEBHOOK_TRIGGER CODEBUILD_BUILD_SUCCEEDING=$CODEBUILD_BUILD_SUCCEEDING"
artifacts:
files:
- 'shared-scripts.sh'
- "shared-scripts.sh"
Loading