X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-configure-clustering.sh;h=bf5ba87a457c76284320f6d88f06a75e3388ea98;hb=5a6ea423022e8d3e663097d510513dde2a56b7e9;hp=35b7f08c04b8e1c9f35f1146d96153f77d4c09b5;hpb=f9cbe530759865c18a5e0c2e67287416721cbbd5;p=releng%2Fbuilder.git diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh index 35b7f08c0..bf5ba87a4 100644 --- a/jjb/integration/include-raw-integration-configure-clustering.sh +++ b/jjb/integration/include-raw-integration-configure-clustering.sh @@ -13,7 +13,7 @@ function join { final=$1; shift for str in $* ; do - final=${final}${delim}${str} + final=${final}${delim}${str} done echo ${final} @@ -71,6 +71,22 @@ cat ${MODULESCONF} echo "Dump module-shards.conf" cat ${MODULESHARDSCONF} +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 +JAVA_RESOLVED=`readlink -e "\${JAVA_HOME}/bin/java"` +echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}" +echo "JDK default version ..." +java -version + echo "Starting controller..." /tmp/${BUNDLEFOLDER}/bin/start