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
cd /tmp
echo "Downloading the distribution from ${ACTUALBUNDLEURL}"
-wget --no-verbose ${ACTUALBUNDLEURL}
+wget --no-verbose '${ACTUALBUNDLEURL}'
echo "Extracting the new controller..."
unzip -q ${BUNDLE}
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 "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}
EOF
-CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
-for i in "${!CONTROLLERIPS[@]}"
+for i in `seq 1 ${NUM_ODL_SYSTEM}`
do
- echo "Installing distribution in member-$i with IP address ${CONTROLLERIPS[$i]}"
- scp ${WORKSPACE}/deploy-controller-script.sh ${CONTROLLERIPS[$i]}:/tmp
- ssh ${CONTROLLERIPS[$i]} 'bash /tmp/deploy-controller-script.sh'
+ 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 :
-