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
Rework the way Java version is set in CSIT jobs
[releng/builder.git]
/
jjb
/
integration
/
include-raw-integration-deploy-controller.sh
diff --git
a/jjb/integration/include-raw-integration-deploy-controller.sh
b/jjb/integration/include-raw-integration-deploy-controller.sh
index 5aabfb41f96e64f783772c5caa9e985faacd9b82..d9ac4da92cc3f31963efb585c3164bfb7ae4c475 100644
(file)
--- a/
jjb/integration/include-raw-integration-deploy-controller.sh
+++ b/
jjb/integration/include-raw-integration-deploy-controller.sh
@@
-10,6
+10,9
@@
if [ ${CONTROLLERSCOPE} == 'all' ]; then
else
ACTUALFEATURES="${CONTROLLERFEATURES}"
fi
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
cat > ${WORKSPACE}/deploy-controller-script.sh <<EOF
@@
-40,9
+43,6
@@
MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
cat \${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
-
EOF
for i in `seq 1 ${NUM_ODL_SYSTEM}`
EOF
for i in `seq 1 ${NUM_ODL_SYSTEM}`
@@
-54,4
+54,3
@@
do
done
# vim: ts=4 sw=4 sts=4 et ft=sh :
done
# vim: ts=4 sw=4 sts=4 et ft=sh :
-