Add NUM_TOOLS_SYSTEM variable to pybot

[releng/builder.git] / jjb / integration / integration-deploy-controller-run-test.sh

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 16958a9cc6f5b5c9e1ad9428ebd96bbe8c10a847..021161e61d6a10646aaf01618dba9d0eae810bc1 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -322,6 +322,7 @@ pybot -N ${TESTPLAN} \
       -v CONTROLLER_USER:${USER} \
       -v JAVA_HOME:${JAVA_HOME} \
       -v JDKVERSION:${JDKVERSION} \
+      -v JENKINS_WORKSPACE:${WORKSPACE} \
       -v MININET1:${TOOLS_SYSTEM_2_IP} \
       -v MININET2:${TOOLS_SYSTEM_3_IP} \
       -v MININET3:${TOOLS_SYSTEM_4_IP} \
@@ -331,6 +332,7 @@ pybot -N ${TESTPLAN} \
       -v MININET_USER:${USER} \
       -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
       -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
+      -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
       -v ODL_STREAM:${DISTROSTREAM} \
       -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
       -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
@@ -345,7 +347,6 @@ pybot -N ${TESTPLAN} \
       -v TOOLS_SYSTEM_USER:${USER} \
       -v USER_HOME:${HOME} \
       -v WORKSPACE:/tmp \
-      -v JENKINS_WORKSPACE:${WORKSPACE} \
       ${TESTOPTIONS} ${SUITES} || true
 
 echo "Examining the files in data/log and checking filesize"