X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-get-bundle-vars.sh;h=c2f592a7c5b5b22b2b570c432dc96e4479c24fa5;hb=c0598b3fd754f4e7e7384a89fdd89e74e044b1cf;hp=641503ebabbcfaff5ef11ff4ad101106b87274ee;hpb=a95ec02134e1f458d67521bac274122663db6b3c;p=releng%2Fbuilder.git diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh index 641503eba..c2f592a7c 100644 --- a/jjb/integration/include-raw-integration-get-bundle-vars.sh +++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh @@ -26,11 +26,20 @@ else BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}" fi +if [ ${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 "Distribution bundle URL is ${ACTUALBUNDLEURL}" echo "Distribution bundle is ${BUNDLE}" echo "Distribution bundle version is ${BUNDLEVERSION}" echo "Distribution folder is ${BUNDLEFOLDER}" echo "Nexus prefix is ${NEXUSURL_PREFIX}" +echo "Java home is ${JAVA_HOME}" cat > ${WORKSPACE}/bundle_vars.txt <