Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not provide JDKVERSION from distribution-test job
[releng/builder.git]
/
jjb
/
integration
/
include-raw-integration-configure-clustering.sh
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
# 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
echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
echo "JDK default version ..."
java -version