From 5af97227ec5c9f3e54e17a1652e94214f833530c Mon Sep 17 00:00:00 2001
From: Jonathan Hess <hessjc@google.com>
Date: Mon, 19 May 2025 15:44:07 -0600
Subject: [PATCH] ci: Update to use zulu-openjdk-21 image for integration
 tests.

This better matches Github Action build configuration to Cloud build.
---
 .ci/cloudbuild.yaml          |  3 +--
 .github/scripts/run_tests.sh | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.ci/cloudbuild.yaml b/.ci/cloudbuild.yaml
index 60a675f3b..bdccf901c 100644
--- a/.ci/cloudbuild.yaml
+++ b/.ci/cloudbuild.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 steps:
   - id: run integration tests
-    name: maven:${_MAVEN_VERSION}
+    name: ${_CONTAINER_IMAGE}
     entrypoint: bash
     env:
       - "IP_TYPE=${_IP_TYPE}"
@@ -106,7 +106,6 @@ availableSecrets:
     - versionName: "projects/$PROJECT_ID/secrets/CLOUD_BUILD_SA/versions/latest"
       env: "IMPERSONATED_USER"
 substitutions:
-  _MAVEN_VERSION: ${_VERSION}
   _IP_TYPE: ${_IP_TYPE}
 options:
   dynamicSubstitutions: true
diff --git a/.github/scripts/run_tests.sh b/.github/scripts/run_tests.sh
index a8c40c7ed..979f061eb 100755
--- a/.github/scripts/run_tests.sh
+++ b/.github/scripts/run_tests.sh
@@ -14,7 +14,10 @@
 # limitations under the License.
 
 # `-e` enables the script to automatically fail when a command fails
-set -e
+set -ex
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+PROJECT_DIR=$( dirname "$SCRIPT_DIR" )
 
 if [[ $OSTYPE == 'darwin'* ]]; then
   # Add alias for 127.0.0.2 to be used as a loopback address
@@ -27,7 +30,16 @@ echo -e "******************** Running tests... ********************\n"
 echo "Running tests using Java:"
 java -version
 
-echo "Maven version: $(mvn --version)"
+# Use the mvn command
+if which mvn ; then
+  mvn_cmd="mvn"
+else
+  mvn_cmd="./mvnw"
+fi
+
+ls -al
+
+echo "Maven version: $($mvn_cmd --version)"
 
 echo "Job type: ${JOB_TYPE}"
 
@@ -36,11 +48,11 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    mvn -e -B clean -ntp test -P coverage -Dcheckstyle.skip
+    $mvn_cmd -e -B clean -ntp test -P coverage -Dcheckstyle.skip
     RETURN_CODE=$?
     ;;
 integration)
-    mvn -e -B clean -ntp verify -P e2e -P coverage -Dcheckstyle.skip
+    $mvn_cmd -e -B clean -ntp verify -P e2e -P coverage -Dcheckstyle.skip
     RETURN_CODE=$?
     ;;
 esac