Recognize openjdk17 in integration scripts

There is a new possibility, make sure we recognize it.

Change-Id: Id77764482c67140efc3b1fe1abe6c9946ae66f83
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index a02b91bf58a328fa68a9b4dc04647fdb182e8a76..f10c09a56ef3dc5a9777098d63a338f34cef9edc 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -72,7 +72,10 @@ cat "${MEMCONF}"
 echo "Listing all open ports on controller system"
 netstat -pnatu
 
-if [ "$JDKVERSION" == 'openjdk11' ]; then
+if [ "$JDKVERSION" == 'openjdk17' ]; then
+    echo "Preparing for JRE Version 17"
+    JAVA_HOME="/usr/lib/jvm/java-17-openjdk"
+elif [ "$JDKVERSION" == 'openjdk11' ]; then
     echo "Preparing for JRE Version 11"
     JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
 elif [ "${JDKVERSION}" == 'openjdk8' ]; then

diff --git a/jjb/integration/integration-set-variables.sh b/jjb/integration/integration-set-variables.sh
index e51c626e06ded575368f935fc6b067494a39398f..8dd5e93e295a88470e700d023472ef2c0f95a01b 100644 (file)
--- a/jjb/integration/integration-set-variables.sh
+++ b/jjb/integration/integration-set-variables.sh
@@ -20,7 +20,10 @@ else
     KARAF_PROJECT="integration"
 fi
 
-if [ "$JDKVERSION" == 'openjdk11' ]; then
+if [ "$JDKVERSION" == 'openjdk17' ]; then
+    echo "Preparing for JRE Version 17"
+    JAVA_HOME="/usr/lib/jvm/java-17-openjdk"
+elif [ "$JDKVERSION" == 'openjdk11' ]; then
     echo "Preparing for JRE Version 11"
     JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
 elif [ "$JDKVERSION" == 'openjdk8' ]; then