From 09705353bbb505e226c4f9d0db1ce675dea3760f Mon Sep 17 00:00:00 2001 From: Christian Mueller Date: Sun, 16 Jan 2022 22:24:29 +0100 Subject: [PATCH] fixed docker agent issue, using java 17 instead of java 8 --- .../test/integration/codebuild-local/Dockerfile.agent | 2 +- .../test/integration/codebuild/buildspec.os.alpine.yml | 4 +++- .../integration/codebuild/buildspec.os.amazoncorretto.yml | 4 +++- .../test/integration/codebuild/buildspec.os.amazonlinux.1.yml | 4 +++- .../test/integration/codebuild/buildspec.os.amazonlinux.2.yml | 4 +++- .../test/integration/codebuild/buildspec.os.centos.yml | 4 +++- .../test/integration/codebuild/buildspec.os.debian.yml | 4 +++- .../test/integration/codebuild/buildspec.os.ubuntu.yml | 4 +++- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent b/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent index 120bdad7..4134cbcb 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent @@ -1,4 +1,4 @@ -FROM amazonlinux:2 +FROM public.ecr.aws/amazoncorretto/amazoncorretto:8 RUN amazon-linux-extras enable docker && \ yum clean metadata && \ diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.alpine.yml b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.alpine.yml index 910fa8aa..470c7178 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.alpine.yml +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.alpine.yml @@ -33,6 +33,8 @@ phases: fi pre_build: commands: + # Log some environment variables for troubleshooting + - (mvn -v) # Install events (dependency of serialization) - (cd aws-lambda-java-events && mvn install) # Install serialization (dependency of RIC) @@ -117,4 +119,4 @@ phases: - docker rm --force "${OS_DISTRIBUTION}-app" || true - docker stop "${OS_DISTRIBUTION}-tester" || true - docker rm --force "${OS_DISTRIBUTION}-tester" || true - - docker network rm "${OS_DISTRIBUTION}-network" || true \ No newline at end of file + - docker network rm "${OS_DISTRIBUTION}-network" || true diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazoncorretto.yml b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazoncorretto.yml index b12b59af..022ed8c9 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazoncorretto.yml +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazoncorretto.yml @@ -31,6 +31,8 @@ phases: fi pre_build: commands: + # Log some environment variables for troubleshooting + - (mvn -v) # Install events (dependency of serialization) - (cd aws-lambda-java-events && mvn install) # Install serialization (dependency of RIC) @@ -112,4 +114,4 @@ phases: - docker rm --force "${OS_DISTRIBUTION}-app" || true - docker stop "${OS_DISTRIBUTION}-tester" || true - docker rm --force "${OS_DISTRIBUTION}-tester" || true - - docker network rm "${OS_DISTRIBUTION}-network" || true \ No newline at end of file + - docker network rm "${OS_DISTRIBUTION}-network" || true diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.1.yml b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.1.yml index e49ee0f5..49fe4b80 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.1.yml +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.1.yml @@ -30,6 +30,8 @@ phases: fi pre_build: commands: + # Log some environment variables for troubleshooting + - (mvn -v) # Install events (dependency of serialization) - (cd aws-lambda-java-events && mvn install) # Install serialization (dependency of RIC) @@ -111,4 +113,4 @@ phases: - docker rm --force "${OS_DISTRIBUTION}-app" || true - docker stop "${OS_DISTRIBUTION}-tester" || true - docker rm --force "${OS_DISTRIBUTION}-tester" || true - - docker network rm "${OS_DISTRIBUTION}-network" || true \ No newline at end of file + - docker network rm "${OS_DISTRIBUTION}-network" || true diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.2.yml b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.2.yml index 00a34e59..2635b32c 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.2.yml +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.amazonlinux.2.yml @@ -30,6 +30,8 @@ phases: fi pre_build: commands: + # Log some environment variables for troubleshooting + - (mvn -v) # Install events (dependency of serialization) - (cd aws-lambda-java-events && mvn install) # Install serialization (dependency of RIC) @@ -111,4 +113,4 @@ phases: - docker rm --force "${OS_DISTRIBUTION}-app" || true - docker stop "${OS_DISTRIBUTION}-tester" || true - docker rm --force "${OS_DISTRIBUTION}-tester" || true - - docker network rm "${OS_DISTRIBUTION}-network" || true \ No newline at end of file + - docker network rm "${OS_DISTRIBUTION}-network" || true diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.centos.yml b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.centos.yml index 5fc211ed..1f6b0d58 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.centos.yml +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.centos.yml @@ -31,6 +31,8 @@ phases: fi pre_build: commands: + # Log some environment variables for troubleshooting + - (mvn -v) # Install events (dependency of serialization) - (cd aws-lambda-java-events && mvn install) # Install serialization (dependency of RIC) @@ -112,4 +114,4 @@ phases: - docker rm --force "${OS_DISTRIBUTION}-app" || true - docker stop "${OS_DISTRIBUTION}-tester" || true - docker rm --force "${OS_DISTRIBUTION}-tester" || true - - docker network rm "${OS_DISTRIBUTION}-network" || true \ No newline at end of file + - docker network rm "${OS_DISTRIBUTION}-network" || true diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.debian.yml b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.debian.yml index 1150ff3f..2fad4d9b 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.debian.yml +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.debian.yml @@ -30,6 +30,8 @@ phases: fi pre_build: commands: + # Log some environment variables for troubleshooting + - (mvn -v) # Install events (dependency of serialization) - (cd aws-lambda-java-events && mvn install) # Install serialization (dependency of RIC) @@ -114,4 +116,4 @@ phases: - docker rm --force "${OS_DISTRIBUTION}-app" || true - docker stop "${OS_DISTRIBUTION}-tester" || true - docker rm --force "${OS_DISTRIBUTION}-tester" || true - - docker network rm "${OS_DISTRIBUTION}-network" || true \ No newline at end of file + - docker network rm "${OS_DISTRIBUTION}-network" || true diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.ubuntu.yml b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.ubuntu.yml index ef3478ed..3abedd65 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.ubuntu.yml +++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.ubuntu.yml @@ -32,6 +32,8 @@ phases: fi pre_build: commands: + # Log some environment variables for troubleshooting + - (mvn -v) # Install events (dependency of serialization) - (cd aws-lambda-java-events && mvn install) # Install serialization (dependency of RIC) @@ -116,4 +118,4 @@ phases: - docker rm --force "${OS_DISTRIBUTION}-app" || true - docker stop "${OS_DISTRIBUTION}-tester" || true - docker rm --force "${OS_DISTRIBUTION}-tester" || true - - docker network rm "${OS_DISTRIBUTION}-network" || true \ No newline at end of file + - docker network rm "${OS_DISTRIBUTION}-network" || true