Merge "Migrate maven to freestyle for validation-autorelease"

[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 9e3227bd8166a6a4d1f30231982962f036c9210f..d7ef3a5f29716c6481d372446136b8e650755fd1 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,5 @@
+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
@@ -7,12 +9,13 @@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
 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_IP:$OPENSTACK_CONTROL_NODE_IP \
 -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/