Rework the way Java version is set in CSIT jobs

[releng/builder.git] / jjb / integration / include-raw-integration-deploy-controller-verify.sh

diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
index 2066e3e2b942049f5b8bdc129b8784997273077e..863ba3ae8439671eb5d97e157e512192b69a21b1 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
@@ -35,7 +35,19 @@ netstat -natu
 echo "redirected karaf console output to karaf_console.log"
 export KARAF_REDIRECT=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
 
-echo "JDK Version ..."
+if [ ${JDKVERSION} == 'openjdk8' ]; then
+    echo "Setting the JRE Version to 8"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    echo "Setting the JRE Version to 7"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+fi
+readlink -e "${JAVA_HOME}/bin/java"
+echo "Default JDK Version, JAVA_HOME should override"
 java -version
 
 echo "Starting controller..."