Add JENKINS_WORKSPACE and alphabetize

Change-Id: If26d76db294405a466c1675f1b5517688bc601e1
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 16958a9cc6f5b5c9e1ad9428ebd96bbe8c10a847..5e1e3685fc71117cf61e8814ffa260619af0483c 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} \
@@ -345,7 +346,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"

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 8d510e61e31364485084beeb77db4662e4ec7214..fad09d960e2eb0e0deadfbd5b1803362bac9d673 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -1411,6 +1411,7 @@ for suite in ${SUITES}; do
     -v HA_PROXY_2_IP:${HA_PROXY_2_IP} \
     -v HA_PROXY_3_IP:${HA_PROXY_3_IP} \
     -v JDKVERSION:${JDKVERSION} \
+    -v JENKINS_WORKSPACE:${WORKSPACE} \
     -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
     -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
     -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \

diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh
index 4ce0682170e8090514dd09e8a31506b231b22180..8a548b938df0ffd7f8982873f0f36ccf6e6464ed 100644 (file)
--- a/jjb/integration/integration-start-cluster-run-test.sh
+++ b/jjb/integration/integration-start-cluster-run-test.sh
@@ -130,15 +130,34 @@ else
 fi
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} \
--v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} -v JAVA_HOME:${JAVA_HOME} \
--v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
--v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
-${odl_variables} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} -v \
-TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} -v TOOLS_SYSTEM_USER:${USER} \
--v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
--v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
-# FIXME: Sort (at least -v) options alphabetically.
+pybot -N ${TESTPLAN} \
+      --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+      -v BUNDLEFOLDER:${BUNDLEFOLDER} \
+      -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
+      -v CONTROLLER:${ODL_SYSTEM_IP} \
+      -v CONTROLLER1:${ODL_SYSTEM_2_IP} \
+      -v CONTROLLER2:${ODL_SYSTEM_3_IP} \
+      -v CONTROLLER_USER:${USER} \
+      -v JAVA_HOME:${JAVA_HOME} \
+      -v JDKVERSION:${JDKVERSION} \
+      -v JENKINS_WORKSPACE:${WORKSPACE} \
+      -v MININET:${TOOLS_SYSTEM_IP} \
+      -v MININET1:${TOOLS_SYSTEM_2_IP} \
+      -v MININET2:${TOOLS_SYSTEM_3_IP} \
+      -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_IP:${ODL_SYSTEM_IP} ${odl_variables} \
+      -v ODL_SYSTEM_USER:${USER} \
+      -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} \
+      -v TOOLS_SYSTEM_USER:${USER} \
+      -v USER_HOME:${HOME} \
+      -v WORKSPACE:/tmp \
+      ${TESTOPTIONS} ${SUITES} || true
+
+
 
 echo "Examining the files in data/log and checking filesize"
 ssh ${ODL_SYSTEM_1_IP} "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"