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
Merge "Gzip karaf.log before fetching and archiving it"
[releng/builder.git]
/
jjb
/
integration
/
include-raw-integration-deploy-devstack-testing.sh
diff --git
a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
index ead72f1434b2c6e838bc243f9e63a3a92b8abb89..68bfe24980e0e12250c663e1d7d58dae0eff5608 100644
(file)
--- a/
jjb/integration/include-raw-integration-deploy-devstack-testing.sh
+++ b/
jjb/integration/include-raw-integration-deploy-devstack-testing.sh
@@
-1,3
+1,9
@@
+#@IgnoreInspection BashAddShebang
+# Activate robotframework virtualenv
+# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
+# script.
+source ${ROBOT_VENV}/bin/activate
+
echo "Changing the testplan path..."
cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt
cat testplan.txt
echo "Changing the testplan path..."
cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt
cat testplan.txt
@@
-7,15
+13,17
@@
SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
echo "Starting Robot test suites ${SUITES} ..."
pybot -e exclude \
echo "Starting Robot test suites ${SUITES} ..."
pybot -e exclude \
--v WORKSPACE:
/tmp
-v USER_HOME:$HOME -L TRACE \
+-v WORKSPACE:
$WORKSPACE
-v USER_HOME:$HOME -L TRACE \
-v DEVSTACK_SYSTEM_USER:$USER \
-v DEVSTACK_SYSTEM_USER:$USER \
--v DEVSTACK_SYSTEM_IP:$O
DL_SYSTEM
_IP \
+-v DEVSTACK_SYSTEM_IP:$O
PENSTACK_CONTROL_NODE
_IP \
-v DEFAULT_LINUX_PROMPT:\]\> \
-v OPENSTACK_BRANCH:$OPENSTACK_BRANCH \
-v ODL_VERSION:$ODL_VERSION \
-v DEFAULT_LINUX_PROMPT:\]\> \
-v OPENSTACK_BRANCH:$OPENSTACK_BRANCH \
-v ODL_VERSION:$ODL_VERSION \
+-v DEVSTACK_DEPLOY_PATH:/opt/stack/new/devstack \
-v TEMPEST_REGEX:$TEMPEST_REGEX ${SUITES} || true
-v TEMPEST_REGEX:$TEMPEST_REGEX ${SUITES} || true
-scp -r $ODL_SYSTEM_IP:/opt/stack/logs/ $WORKSPACE/
+scp $OPENSTACK_CONTROL_NODE_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/
+scp -r $OPENSTACK_CONTROL_NODE_IP:/opt/stack/logs/*karaf* $WORKSPACE/
# vim: ts=4 sw=4 sts=4 et ft=sh :
# vim: ts=4 sw=4 sts=4 et ft=sh :