This is an automated email from the ASF dual-hosted git repository.
dhemery pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new ff3c806e19 backport/geode 10288/java homes (#7694)
ff3c806e19 is described below
commit ff3c806e1960f6abeb2be6982e01c713e03d97f1
Author: Dale Emery <[email protected]>
AuthorDate: Fri May 13 16:30:04 2022 -0700
backport/geode 10288/java homes (#7694)
* GEODE-10288: Define JDK 8, 11, 17 homes for upgrade tests (#7675)
* GEODE-10288: Fix property assignment syntax (#7678)
---
ci/scripts/execute_tests.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index 4c59368f65..8e66a06084 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -72,6 +72,9 @@ case $ARTIFACT_SLUG in
echo "Making environment adjustments for windows."
JAVA_BUILD_PATH=C:/java${JAVA_BUILD_VERSION}
JAVA_TEST_PATH=C:/java${JAVA_TEST_VERSION}
+ TEST_JAVA_8_HOME=C:/java8
+ TEST_JAVA_11_HOME=C:/java11
+ TEST_JAVA_17_HOME=C:/java17
GRADLE_SKIP_TASK_OPTIONS="${GRADLE_SKIP_TASK_OPTIONS} -x docker"
SEP=";"
OPTIONAL_KILL_ALL_CMD="${SEP} \
@@ -83,6 +86,9 @@ case $ARTIFACT_SLUG in
*)
JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
JAVA_TEST_PATH=/usr/lib/jvm/bellsoft-java${JAVA_TEST_VERSION}-amd64
+ TEST_JAVA_8_HOME=/usr/lib/jvm/bellsoft-java8-amd64
+ TEST_JAVA_11_HOME=/usr/lib/jvm/bellsoft-java11-amd64
+ TEST_JAVA_17_HOME=/usr/lib/jvm/bellsoft-java17-amd64
SEP="&&"
;;
esac
@@ -98,6 +104,9 @@ GRADLE_ARGS=" \
-PcompileJVMVer=${JAVA_BUILD_VERSION} \
-PtestJVM=${JAVA_TEST_PATH} \
-PtestJVMVer=${JAVA_TEST_VERSION} \
+ -PtestJava8Home=${TEST_JAVA_8_HOME} \
+ -PtestJava11Home=${TEST_JAVA_11_HOME} \
+ -PtestJava17Home=${TEST_JAVA_17_HOME} \
${PARALLEL_DUNIT} \
${DUNIT_PARALLEL_FORKS} \
${DEFAULT_GRADLE_TASK_OPTIONS} \
