Do not provide JDKVERSION from distribution-test job

Also, repair JAVA_HOME setting on remote machine.

Change-Id: I3b3e5be9df5727ff85e5911ea358ade0a74cd6d6
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 bf5ba87a457c76284320f6d88f06a75e3388ea98..d0f7af7e2563f27ea14e8ea0349d12b1ce016bd0 100644 (file)
--- a/jjb/integration/include-raw-integration-configure-clustering.sh
+++ b/jjb/integration/include-raw-integration-configure-clustering.sh
@@ -82,7 +82,9 @@ elif [ ${JDKVERSION} == 'openjdk7' ]; then
     # 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_HOME is \${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}"
 echo "JDK default version ..."
 java -version

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 c17efb377325cf9578b960bd1c574ea975f9fef2..e47c2848cd7c88c6e58e7fba72dab414dd4ea435 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -72,7 +72,9 @@ elif [ ${JDKVERSION} == 'openjdk7' ]; then
     # 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_HOME is \${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}"
 echo "JDK default version ..."
 java -version

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 3d84b991499767293fecfdac844113b919fbc5e1..70843805f6d5dedabaa2ed842d10639170fe66ce 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -381,7 +381,6 @@
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
-                  JDKVERSION=$JDKVERSION
 
     publishers:
         - email-notification: