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 433c0b8ededf9e035b84695a06745244cd76ef92..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
@@ -13,6 +19,7 @@ pybot -e exclude \
 -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
 
 scp $OPENSTACK_CONTROL_NODE_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/