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
echo "Configuring the log..."
LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' \${LOGCONF}
+sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' \${LOGCONF}
+# FIXME: Make log size limit configurable from build parameter.
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
cat \${LOGCONF}
echo "Configure max memory..."
echo "Listing all open ports on controller system"
netstat -natu
+echo "JDK Version ..."
+java -version
+
EOF
for i in `seq 1 ${NUM_ODL_SYSTEM}`