From d377bb939267fe9e78e85c80bd045c6280c1ec2f Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 30 May 2019 13:55:33 -0700 Subject: [PATCH] Remove codebuild hacks and move to the standard codebuild image. --- buildspecs/benchmarks.yml | 4 ++++ buildspecs/better-integ-test.yml | 4 ++++ buildspecs/build.yml | 6 +++++- buildspecs/integ-test.yml | 6 +++++- buildspecs/on-demand-integ-test.yml | 6 +++++- buildspecs/release-javadoc.yml | 5 ++++- buildspecs/release-to-github.yml | 4 ++++ buildspecs/release-to-maven.yml | 3 +++ buildspecs/update-master-from-release.yml | 4 ++++ buildspecs/update-snapshot-version.yml | 4 ++++ scripts/run-integ-test | 2 +- 11 files changed, 43 insertions(+), 5 deletions(-) diff --git a/buildspecs/benchmarks.yml b/buildspecs/benchmarks.yml index 7dc0a2be9c38..95d37d12b28d 100644 --- a/buildspecs/benchmarks.yml +++ b/buildspecs/benchmarks.yml @@ -1,6 +1,10 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + build: commands: - mvn install -P quick -pl :sdk-benchmarks --am diff --git a/buildspecs/better-integ-test.yml b/buildspecs/better-integ-test.yml index 84e2cd756966..cb2d81faf2ea 100644 --- a/buildspecs/better-integ-test.yml +++ b/buildspecs/better-integ-test.yml @@ -1,6 +1,10 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + build: commands: - python scripts/run-integ-test \ No newline at end of file diff --git a/buildspecs/build.yml b/buildspecs/build.yml index 459ada07bbe3..10e0ccbdd756 100644 --- a/buildspecs/build.yml +++ b/buildspecs/build.yml @@ -1,9 +1,13 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + build: commands: - - mvn clean install -D maven.wagon.httpconnectionManager.maxPerRoute=2 + - mvn clean install -T1C - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1) - echo $JAVA_VERSION - | diff --git a/buildspecs/integ-test.yml b/buildspecs/integ-test.yml index 8979e4f5aaf2..ff4a67b98e8e 100644 --- a/buildspecs/integ-test.yml +++ b/buildspecs/integ-test.yml @@ -1,9 +1,13 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + build: commands: - - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1 -Dmaven.wagon.httpconnectionManager.maxPerRoute=2 -T1C + - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1 -T1C - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1) - echo $JAVA_VERSION - | diff --git a/buildspecs/on-demand-integ-test.yml b/buildspecs/on-demand-integ-test.yml index 6f98dc386c4d..72889bad78db 100644 --- a/buildspecs/on-demand-integ-test.yml +++ b/buildspecs/on-demand-integ-test.yml @@ -1,9 +1,13 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + build: commands: - - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 -Dmaven.wagon.httpconnectionManager.maxPerRoute=2 --fail-at-end + - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 --fail-at-end - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1) - echo $JAVA_VERSION - | diff --git a/buildspecs/release-javadoc.yml b/buildspecs/release-javadoc.yml index 83db036abad0..ebdbdbe0979f 100644 --- a/buildspecs/release-javadoc.yml +++ b/buildspecs/release-javadoc.yml @@ -2,6 +2,9 @@ version: 0.2 phases: install: + runtime-versions: + java: "$JAVA_RUNTIME" + commands: - pip install awscli --upgrade --user @@ -11,7 +14,7 @@ phases: build: commands: - - mvn install -P quick -D maven.wagon.httpconnectionManager.maxPerRoute=2 -T1C + - mvn install -P quick -T1C - mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting' - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec` - diff --git a/buildspecs/release-to-github.yml b/buildspecs/release-to-github.yml index 4182dcd1e39f..e44976723641 100644 --- a/buildspecs/release-to-github.yml +++ b/buildspecs/release-to-github.yml @@ -1,6 +1,10 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + pre_build: commands: - git config --global user.name "AWS" diff --git a/buildspecs/release-to-maven.yml b/buildspecs/release-to-maven.yml index f130b88013d8..aa8007d1e44c 100644 --- a/buildspecs/release-to-maven.yml +++ b/buildspecs/release-to-maven.yml @@ -2,6 +2,9 @@ version: 0.2 phases: install: + runtime-versions: + java: "$JAVA_RUNTIME" + commands: - pip install awscli --upgrade --user diff --git a/buildspecs/update-master-from-release.yml b/buildspecs/update-master-from-release.yml index e77a906a7904..c7ab70da2ecb 100644 --- a/buildspecs/update-master-from-release.yml +++ b/buildspecs/update-master-from-release.yml @@ -1,6 +1,10 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + pre_build: commands: - git config --global user.name "AWS" diff --git a/buildspecs/update-snapshot-version.yml b/buildspecs/update-snapshot-version.yml index 1cc5bc40104f..77432700d364 100644 --- a/buildspecs/update-snapshot-version.yml +++ b/buildspecs/update-snapshot-version.yml @@ -1,6 +1,10 @@ version: 0.2 phases: + install: + runtime-versions: + java: "$JAVA_RUNTIME" + pre_build: commands: - git config --global user.name "AWS" diff --git a/scripts/run-integ-test b/scripts/run-integ-test index 29b22f53dd07..13f10827b7f0 100755 --- a/scripts/run-integ-test +++ b/scripts/run-integ-test @@ -61,7 +61,7 @@ def run_tests(modules): modules_to_include = modules_to_include[:-1] # build necessary dependencies first - check_call(["mvn", "clean", "install", "-pl", modules_to_include, "-P", "quick", "--am", "-Dmaven.wagon.httpconnectionManager.maxPerRoute=2"]) + check_call(["mvn", "clean", "install", "-pl", modules_to_include, "-P", "quick", "--am"]) check_call(["mvn", "verify", "-pl", modules_to_include, "-P", "integration-tests", "-Dfailsafe.rerunFailingTestsCount=1"]) if __name__ == "__main__":