From 8e59cbb1bb9bff7080d0f59d198bd2fc1b955839 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 11:49:25 -0700 Subject: [PATCH 01/10] chore: moving buildspec to new location and bumping codebuild images to 5.0 --- codebuild/ci/ci.yml | 89 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 codebuild/ci/ci.yml diff --git a/codebuild/ci/ci.yml b/codebuild/ci/ci.yml new file mode 100644 index 000000000..e1af5e8ef --- /dev/null +++ b/codebuild/ci/ci.yml @@ -0,0 +1,89 @@ +version: 0.2 + +# TODO: Replace/Augment build-graph with build-matrix +# Note: It's possible that 9 builds will be running concurrently with the current arrangement + +batch: + fast-fail: false + build-graph: + - identifier: static_analysis + buildspec: ci/static_analysis.yml + env: + compute-type: BUILD_GENERAL1_MEDIUM + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + ######### Start Vector tests ######### + - identifier: vectors_ci_openjdk8 + buildspec: ci/vectors-ci.yml + env: + compute-type: BUILD_GENERAL1_LARGE + variables: + JAVA_ENV_VERSION: openjdk8 + image: aws/codebuild/standard:5.0 + - identifier: vectors_ci_openjdk11 + buildspec: ci/vectors-ci.yml + env: + compute-type: BUILD_GENERAL1_LARGE + variables: + JAVA_ENV_VERSION: openjdk11 + image: aws/codebuild/standard:5.0 + - identifier: vectors_ci_corretto8 + buildspec: ci/vectors-ci.yml + env: + compute-type: BUILD_GENERAL1_LARGE + variables: + JAVA_ENV_VERSION: corretto8 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + - identifier: vectors_ci_corretto11 + buildspec: ci/vectors-ci.yml + env: + compute-type: BUILD_GENERAL1_LARGE + variables: + JAVA_ENV_VERSION: corretto11 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + ######### End Vector tests ######### + - identifier: release_ci + buildspec: codebuild/ci/release-ci.yml + env: + compute-type: BUILD_GENERAL1_LARGE + image: aws/codebuild/standard:5.0 + ######### Start JAR Smoke tests ######### + - identifier: validate_ci_openjdk8 + depend-on: + - release_ci + buildspec: ci/validate-ci.yml + env: + variables: + JAVA_ENV_VERSION: openjdk8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/standard:5.0 + - identifier: validate_ci_openjdk11 + depend-on: + - release_ci + buildspec: ci/validate-ci.yml + env: + compute-type: BUILD_GENERAL1_MEDIUM + variables: + JAVA_ENV_VERSION: openjdk11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/standard:5.0 + - identifier: validate_ci_corretto8 + depend-on: + - release_ci + buildspec: codebuild/ci/validate-ci.yml + env: + compute-type: BUILD_GENERAL1_MEDIUM + variables: + JAVA_ENV_VERSION: corretto8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + - identifier: validate_ci_corretto11 + depend-on: + - release_ci + buildspec: codebuild/ci/validate-ci.yml + env: + compute-type: BUILD_GENERAL1_MEDIUM + variables: + JAVA_ENV_VERSION: corretto11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + ######### End JAR Smoke tests ######### From 71737984cffc0cefb93cc0bd68bff0b962628d25 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 11:51:00 -0700 Subject: [PATCH 02/10] chore: buildspec.yml moved and renamed to ci.yml --- buildspec.yml | 89 --------------------------------------------------- 1 file changed, 89 deletions(-) delete mode 100644 buildspec.yml diff --git a/buildspec.yml b/buildspec.yml deleted file mode 100644 index 7c64ccf1d..000000000 --- a/buildspec.yml +++ /dev/null @@ -1,89 +0,0 @@ -version: 0.2 - -# TODO: Replace/Augment build-graph with build-matrix -# Note: It's possible that 9 builds will be running concurrently with the current arrangement - -batch: - fast-fail: false - build-graph: - - identifier: static_analysis - buildspec: codebuild/ci/static-analysis.yml - env: - compute-type: BUILD_GENERAL1_MEDIUM - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - ######### Start Vector tests ######### - - identifier: vectors_ci_openjdk8 - buildspec: codebuild/ci/vectors-ci.yml - env: - compute-type: BUILD_GENERAL1_LARGE - variables: - JAVA_ENV_VERSION: openjdk8 - image: aws/codebuild/standard:3.0 - - identifier: vectors_ci_openjdk11 - buildspec: codebuild/ci/vectors-ci.yml - env: - compute-type: BUILD_GENERAL1_LARGE - variables: - JAVA_ENV_VERSION: openjdk11 - image: aws/codebuild/standard:3.0 - - identifier: vectors_ci_corretto8 - buildspec: codebuild/ci/vectors-ci.yml - env: - compute-type: BUILD_GENERAL1_LARGE - variables: - JAVA_ENV_VERSION: corretto8 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - - identifier: vectors_ci_corretto11 - buildspec: codebuild/ci/vectors-ci.yml - env: - compute-type: BUILD_GENERAL1_LARGE - variables: - JAVA_ENV_VERSION: corretto11 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - ######### End Vector tests ######### - - identifier: release_ci - buildspec: codebuild/ci/release-ci.yml - env: - compute-type: BUILD_GENERAL1_LARGE - image: aws/codebuild/standard:3.0 - ######### Start JAR Smoke tests ######### - - identifier: validate_ci_openjdk8 - depend-on: - - release_ci - buildspec: codebuild/ci/validate-ci.yml - env: - variables: - JAVA_ENV_VERSION: openjdk8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:3.0 - - identifier: validate_ci_openjdk11 - depend-on: - - release_ci - buildspec: codebuild/ci/validate-ci.yml - env: - compute-type: BUILD_GENERAL1_MEDIUM - variables: - JAVA_ENV_VERSION: openjdk11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:3.0 - - identifier: validate_ci_corretto8 - depend-on: - - release_ci - buildspec: codebuild/ci/validate-ci.yml - env: - compute-type: BUILD_GENERAL1_MEDIUM - variables: - JAVA_ENV_VERSION: corretto8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - - identifier: validate_ci_corretto11 - depend-on: - - release_ci - buildspec: codebuild/ci/validate-ci.yml - env: - compute-type: BUILD_GENERAL1_MEDIUM - variables: - JAVA_ENV_VERSION: corretto11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - ######### End JAR Smoke tests ######### From 3a1702d68304b745c8010e41da78fb10375cda1d Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 11:55:04 -0700 Subject: [PATCH 03/10] chore: fix typo --- codebuild/ci/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/ci/ci.yml b/codebuild/ci/ci.yml index e1af5e8ef..4c07198f2 100644 --- a/codebuild/ci/ci.yml +++ b/codebuild/ci/ci.yml @@ -7,7 +7,7 @@ batch: fast-fail: false build-graph: - identifier: static_analysis - buildspec: ci/static_analysis.yml + buildspec: ci/static-analysis.yml env: compute-type: BUILD_GENERAL1_MEDIUM image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 From c8b22df191d78260be7148a81a62ff9433428c43 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 14:27:50 -0700 Subject: [PATCH 04/10] chore: fixing incorretc path --- codebuild/ci/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/codebuild/ci/ci.yml b/codebuild/ci/ci.yml index 4c07198f2..3ed18c29e 100644 --- a/codebuild/ci/ci.yml +++ b/codebuild/ci/ci.yml @@ -7,34 +7,34 @@ batch: fast-fail: false build-graph: - identifier: static_analysis - buildspec: ci/static-analysis.yml + buildspec: codebuild/ci/static-analysis.yml env: compute-type: BUILD_GENERAL1_MEDIUM image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 ######### Start Vector tests ######### - identifier: vectors_ci_openjdk8 - buildspec: ci/vectors-ci.yml + buildspec: codebuild/ci/vectors-ci.yml env: compute-type: BUILD_GENERAL1_LARGE variables: JAVA_ENV_VERSION: openjdk8 image: aws/codebuild/standard:5.0 - identifier: vectors_ci_openjdk11 - buildspec: ci/vectors-ci.yml + buildspec: codebuild/ci/vectors-ci.yml env: compute-type: BUILD_GENERAL1_LARGE variables: JAVA_ENV_VERSION: openjdk11 image: aws/codebuild/standard:5.0 - identifier: vectors_ci_corretto8 - buildspec: ci/vectors-ci.yml + buildspec: codebuild/ci/vectors-ci.yml env: compute-type: BUILD_GENERAL1_LARGE variables: JAVA_ENV_VERSION: corretto8 image: aws/codebuild/amazonlinux2-x86_64-standard:3.0 - identifier: vectors_ci_corretto11 - buildspec: ci/vectors-ci.yml + buildspec: codebuild/ci/vectors-ci.yml env: compute-type: BUILD_GENERAL1_LARGE variables: @@ -50,7 +50,7 @@ batch: - identifier: validate_ci_openjdk8 depend-on: - release_ci - buildspec: ci/validate-ci.yml + buildspec: codebuild/ci/validate-ci.yml env: variables: JAVA_ENV_VERSION: openjdk8 @@ -59,7 +59,7 @@ batch: - identifier: validate_ci_openjdk11 depend-on: - release_ci - buildspec: ci/validate-ci.yml + buildspec: codebuild/ci/validate-ci.yml env: compute-type: BUILD_GENERAL1_MEDIUM variables: From c800f846454d701746f4ab6200e18daa8d0c6abe Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 15:27:39 -0700 Subject: [PATCH 05/10] chore: updating path for test-conditions --- codebuild/ci/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/ci/static-analysis.yml b/codebuild/ci/static-analysis.yml index db66feaa9..9207588bb 100644 --- a/codebuild/ci/static-analysis.yml +++ b/codebuild/ci/static-analysis.yml @@ -8,4 +8,4 @@ phases: build: commands: - mvn -T 4 -ntp com.coveo:fmt-maven-plugin:check - - ./util/test-conditions.sh + - ../../util/test-conditions.sh From f31c27e3adf3d42090eef3a38a281511dd70c56c Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 15:33:19 -0700 Subject: [PATCH 06/10] chore: reverting path --- codebuild/ci/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/ci/static-analysis.yml b/codebuild/ci/static-analysis.yml index 9207588bb..db66feaa9 100644 --- a/codebuild/ci/static-analysis.yml +++ b/codebuild/ci/static-analysis.yml @@ -8,4 +8,4 @@ phases: build: commands: - mvn -T 4 -ntp com.coveo:fmt-maven-plugin:check - - ../../util/test-conditions.sh + - ./util/test-conditions.sh From bfeb06e7a7ce02232ec1f0274c5860971ca8f2ba Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 16:00:13 -0700 Subject: [PATCH 07/10] chore: openjdk8&11 are only available in 3.0 --- codebuild/ci/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codebuild/ci/ci.yml b/codebuild/ci/ci.yml index 3ed18c29e..d0f247432 100644 --- a/codebuild/ci/ci.yml +++ b/codebuild/ci/ci.yml @@ -18,14 +18,14 @@ batch: compute-type: BUILD_GENERAL1_LARGE variables: JAVA_ENV_VERSION: openjdk8 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:3.0 - identifier: vectors_ci_openjdk11 buildspec: codebuild/ci/vectors-ci.yml env: compute-type: BUILD_GENERAL1_LARGE variables: JAVA_ENV_VERSION: openjdk11 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:3.0 - identifier: vectors_ci_corretto8 buildspec: codebuild/ci/vectors-ci.yml env: @@ -55,7 +55,7 @@ batch: variables: JAVA_ENV_VERSION: openjdk8 JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:3.0 - identifier: validate_ci_openjdk11 depend-on: - release_ci @@ -65,7 +65,7 @@ batch: variables: JAVA_ENV_VERSION: openjdk11 JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:3.0 - identifier: validate_ci_corretto8 depend-on: - release_ci From 345f91b3ae937241f0bd8a698772e85ee428c293 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 16:20:54 -0700 Subject: [PATCH 08/10] chore: update image in release_ci --- codebuild/ci/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/ci/ci.yml b/codebuild/ci/ci.yml index d0f247432..7c64ccf1d 100644 --- a/codebuild/ci/ci.yml +++ b/codebuild/ci/ci.yml @@ -45,7 +45,7 @@ batch: buildspec: codebuild/ci/release-ci.yml env: compute-type: BUILD_GENERAL1_LARGE - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:3.0 ######### Start JAR Smoke tests ######### - identifier: validate_ci_openjdk8 depend-on: From dfebf5920c9531509570dc4588cdfa0a66b2c654 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 16:36:47 -0700 Subject: [PATCH 09/10] chore: updating release-ci to use the right account --- codebuild/ci/release-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index e3c6123cc..412fb3223 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -8,7 +8,7 @@ env: NAMESPACE: com.amazonaws PACKAGE: aws-encryption-sdk-java parameter-store: - ACCOUNT: /CodeBuild/AccountId + ACCOUNT: /CodeBuild/AccountIdentity secrets-manager: GPG_KEY: Maven-GPG-Keys-Credentials:Keyname GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase From b535b478e3dd308d5e24103371846c4458d326f7 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 4 Oct 2021 17:32:47 -0700 Subject: [PATCH 10/10] poke CI build