Make JAVA_HOME value available for Robot

Previously, JAVA_HOME was only set temporarily to start ODL.
But if a Robot suite wishes to re-start ODL, it needs to know
the desired JAVA_HOME huitable for given stream.

This moves JAVA_HOME construction to *-get-bundle-vars
and includes -v JAVA_HOME:${JAVA_HOME} option to pybot.

TODO: Make also non-robot places of JAVA_HOME construction
to refer to the prepared value.

Change-Id: I5b2d805ee0171e62b5fabef269c2c75b557409d2
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh
index d0f7af7e2563f27ea14e8ea0349d12b1ce016bd0..ffe71eef4c60ae91f825fe1c6ee369f49fdf2e82 100644 (file)
--- a/jjb/integration/include-raw-integration-configure-clustering.sh
+++ b/jjb/integration/include-raw-integration-configure-clustering.sh
@@ -71,18 +71,8 @@ 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
-echo "JAVA_HOME is \${JAVA_HOME}"
+echo "Set JAVA_HOME"
+export JAVA_HOME="${JAVA_HOME}"
 # Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
 JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
 echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
@@ -110,4 +100,3 @@ do
 done
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
-

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 1eb50f14df939996e7b05cc8524220c30130c751..0f3d93f59dd638edcbefed7c033d8d52207a4cb4 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -61,18 +61,8 @@ cat \${MEMCONF}
 echo "Listing all open ports on controller system..."
 netstat -natu
 
-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
-echo "JAVA_HOME is \${JAVA_HOME}"
+echo "Set JAVA_HOME"
+export JAVA_HOME="$JAVA_HOME"
 # Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
 JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
 echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
@@ -146,7 +136,7 @@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
--v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
+-v JAVA_HOME:${JAVA_HOME} -v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
 -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
 -v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} -v TOOLS_SYSTEM_5_IP:${TOOLS_SYSTEM_5_IP} -v TOOLS_SYSTEM_6_IP:${TOOLS_SYSTEM_6_IP} \

diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh
index 641503ebabbcfaff5ef11ff4ad101106b87274ee..c2f592a7c5b5b22b2b570c432dc96e4479c24fa5 100644 (file)
--- 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 <<EOF
 ACTUALBUNDLEURL=${ACTUALBUNDLEURL}
@@ -38,6 +47,7 @@ BUNDLE=${BUNDLE}
 BUNDLEVERSION=${BUNDLEVERSION}
 BUNDLEFOLDER=${BUNDLEFOLDER}
 NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
+JAVA_HOME=${JAVA_HOME}
 EOF
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 014e3b16d280d021b705a0f9ec372c8429410b52..61f5dac337d33128ce4422c2f32e26e674a6bbfb 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -102,7 +102,8 @@ cat testplan.txt
 SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUALBUNDLEURL} \
+pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} \
+-v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUALBUNDLEURL} -v JAVA_HOME:${JAVA_HOME} \
 -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
 ${odl_variables} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} -v \