From b61875d22b33e2af9445e59d80b2608e5f6d1342 Mon Sep 17 00:00:00 2001
From: Guillaume Caillet <cailletg@amazon.com>
Date: Fri, 28 Jul 2023 14:34:47 -0400
Subject: [PATCH] Fixing AWS integration tests

---
 .gitlab-ci.yml                                  | 3 ++-
 testing/indexer-test-aws/build-aws/run-tests.sh | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca212e0e4..1fb64726a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,8 @@ azure_test:
   image: community.opengroup.org:5555/osdu/platform/deployment-and-operations/base-containers-azure/azure-maven17:v0.0.1
 
 aws-test-java:
-  image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-maven/aws-maven:v2.0
+  image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-maven/aws-maven:v2.1
+  tags: [ "aws-internal-test-ubuntu22.04" ]
 
 fossa-analyze:
   image: $CI_REGISTRY/divido/fossa-with-cache:v0.9-jdk17
diff --git a/testing/indexer-test-aws/build-aws/run-tests.sh b/testing/indexer-test-aws/build-aws/run-tests.sh
index e2fd0042e..fcedeab64 100755
--- a/testing/indexer-test-aws/build-aws/run-tests.sh
+++ b/testing/indexer-test-aws/build-aws/run-tests.sh
@@ -56,6 +56,8 @@ trap '{
 
 #### RUN INTEGRATION TEST #########################################################################
 
+JAVA_HOME=$JAVA17_HOME
+
 mvn -ntp test -f "$SCRIPT_SOURCE_DIR"/../pom.xml -Dcucumber.options="--plugin junit:target/junit-report.xml"
 # mvn -Dmaven.surefire.debug test -f "$SCRIPT_SOURCE_DIR"/../pom.xml -Dcucumber.options="--plugin junit:target/junit-report.xml"
 TEST_EXIT_CODE=$?
-- 
GitLab