Merge "Move odlparent Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / integration / integration-set-variables.sh

diff --git a/jjb/integration/integration-set-variables.sh b/jjb/integration/integration-set-variables.sh
index afb76221d484f840834a04884cb278e1a0108c97..76e8d726321eb8487926a30f686edb567730a4c6 100644 (file)
--- a/jjb/integration/integration-set-variables.sh
+++ b/jjb/integration/integration-set-variables.sh
@@ -10,13 +10,10 @@ fi
 
 if [ "$JDKVERSION" == 'openjdk11' ]; then
     echo "Preparing for JRE Version 11"
-    JAVA_HOME="/opt/jdk-11"
+    JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
 elif [ "$JDKVERSION" == 'openjdk8' ]; then
     echo "Preparing for JRE Version 8"
     JAVA_HOME="/usr/lib/jvm/java-1.8.0"
-elif [ "$JDKVERSION" == 'openjdk7' ]; then
-    echo "Preparing for JRE Version 7"
-    JAVA_HOME="/usr/lib/jvm/java-1.7.0"
 fi
 
 echo "Karaf artifact is ${KARAF_ARTIFACT}"