Merge "Change MININET to TOOLS_SYSTEM_IP in get-slave-addresses.sh"

[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 42f1e26e88e7ae746d0cc288003633cd8b870933..865c31a693b36a30ca1875910cd3a89890c433ba 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -1,5 +1,7 @@
 # Activate robotframework virtualenv
-source $WORKSPACE/venv-robotframework/bin/activate
+# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
+# script.
+source ${ROBOT_VENV}/bin/activate
 
 CONTROLLERMEM="2048m"