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
Fix small typo in the controller deploy script
[releng/builder.git]
/
jjb
/
integration
/
include-raw-integration-deploy-controller-run-test.sh
diff --git
a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 447acb67c662587f927833d482bc81d90f8c158d..0c0ff7e3e7e769784d00f780e87c9de313d524e9 100644
(file)
--- a/
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@
-9,9
+9,14
@@
CONTROLLERMEM="2048m"
if [ ${CONTROLLERSCOPE} == 'all' ]; then
ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
CONTROLLERMEM="3072m"
if [ ${CONTROLLERSCOPE} == 'all' ]; then
ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
CONTROLLERMEM="3072m"
+ COOLDOWN_PERIOD="180"
else
ACTUALFEATURES="${CONTROLLERFEATURES}"
else
ACTUALFEATURES="${CONTROLLERFEATURES}"
+ COOLDOWN_PERIOD="60"
fi
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'`
if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
echo "scriptplan exists!!!"
if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
echo "scriptplan exists!!!"
@@
-85,8
+90,10
@@
while true; do
break
elif (( "\$COUNT" > "600" )); then
echo Timeout Controller DOWN
break
elif (( "\$COUNT" > "600" )); then
echo Timeout Controller DOWN
- echo "Dumping Karaf log..."
- head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+ echo "Dumping first 500K bytes of karaf log..."
+ head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+ echo "Dumping last 500K bytes of karaf log..."
+ tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
echo "Listing all open ports on controller system"
netstat -natu
exit 1
echo "Listing all open ports on controller system"
netstat -natu
exit 1
@@
-97,8
+104,8
@@
while true; do
fi
done
fi
done
-echo "Cool down for
1 min
:)..."
-sleep
60
+echo "Cool down for
${COOLDOWN_PERIOD} seconds
:)..."
+sleep
${COOLDOWN_PERIOD}
echo "Listing all open ports on controller system..."
netstat -natu
echo "Listing all open ports on controller system..."
netstat -natu
@@
-107,8
+114,10
@@
function exit_on_log_file_message {
echo "looking for \"\$1\" in log file"
if grep --quiet "\$1" /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then
echo ABORTING: found "\$1"
echo "looking for \"\$1\" in log file"
if grep --quiet "\$1" /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then
echo ABORTING: found "\$1"
- echo "Dumping Karaf log..."
- head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+ echo "Dumping first 500K bytes of karaf log..."
+ head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+ echo "Dumping last 500K bytes of karaf log..."
+ tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
exit 1
fi
}
exit 1
fi
}
@@
-129,7
+138,7
@@
SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
echo "Starting Robot test suites ${SUITES} ..."
pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
echo "Starting Robot test suites ${SUITES} ..."
pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
--v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
+-v
BUNDLE_URL:${ACTUALBUNDLEURL} -v
NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
-v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
-v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
-v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} -v TOOLS_SYSTEM_5_IP:${TOOLS_SYSTEM_5_IP} -v TOOLS_SYSTEM_6_IP:${TOOLS_SYSTEM_6_IP} \
-v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
-v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
-v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} -v TOOLS_SYSTEM_5_IP:${TOOLS_SYSTEM_5_IP} -v TOOLS_SYSTEM_6_IP:${TOOLS_SYSTEM_6_IP} \
@@
-140,7
+149,7
@@
pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v W
echo "Killing ODL and fetching Karaf log..."
set +e # We do not want to create red dot just because something went wrong while fetching logs.
echo "Killing ODL and fetching Karaf log..."
set +e # We do not want to create red dot just because something went wrong while fetching logs.
-ssh "${ODL_SYSTEM_IP}"
head
--bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
+ssh "${ODL_SYSTEM_IP}"
tail
--bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
ssh "${ODL_SYSTEM_IP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
sleep 5
ssh "${ODL_SYSTEM_IP}" xz -9ekvv "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
ssh "${ODL_SYSTEM_IP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
sleep 5
ssh "${ODL_SYSTEM_IP}" xz -9ekvv "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"