X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-deploy-controller.sh;h=8db436d954e2404e82385a9379bccf59482c037c;hb=bd329baa86ed18e1258c445cb61efffc278ba6af;hp=0b14414017ef9e61dcb57b131af6dd94ac59c535;hpb=77070e6c24cd962353e9e9d6a9c502e36ae359bf;p=releng%2Fbuilder.git

diff --git a/jjb/integration/include-raw-integration-deploy-controller.sh b/jjb/integration/include-raw-integration-deploy-controller.sh
index 0b1441401..8db436d95 100644
--- a/jjb/integration/include-raw-integration-deploy-controller.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller.sh
@@ -10,22 +10,12 @@ if [ ${CONTROLLERSCOPE} == 'all' ]; then
 else
     ACTUALFEATURES="${CONTROLLERFEATURES}"
 fi
+# Some versions of jenkins job builder result in feature list containing spaces
+# and ending in newline. Remove all that.
+ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
 
 cat > ${WORKSPACE}/deploy-controller-script.sh <<EOF
 
-if [ ${JDKVERSION} == 'openjdk8' ]; then
-    echo "Setting the JDK Version to 8"
-    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-openjdk-1.8.0.60-2.b27.el7_1.x86_64
-    java -version
-fi
-if [ ${JDKVERSION} == 'openjdk7' ]; then
-    echo "Setting the JDK Version to 7"
-    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-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64
-    java -version
-fi
-
 echo "Changing to /tmp"
 cd /tmp
 
@@ -48,26 +38,20 @@ sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupInde
 sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
 cat \${LOGCONF}
 
-echo "Configure max memory..."
+echo "Configure java home and max memory..."
 MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
+sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' \${MEMCONF}
 sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
 cat \${MEMCONF}
 
-echo "Listing all open ports on controller system"
-netstat -natu
-
-echo "JDK Version ..."
-java -version
-
 EOF
 
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP 
+    CONTROLLERIP=ODL_SYSTEM_${i}_IP
     echo "Installing distribution in member-${i} with IP address ${!CONTROLLERIP}"
     scp ${WORKSPACE}/deploy-controller-script.sh ${!CONTROLLERIP}:/tmp
     ssh ${!CONTROLLERIP} 'bash /tmp/deploy-controller-script.sh'
 done
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
-