X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-controller-run-test.sh;h=788da938b0c3a20b7220d502fc7bd62c57ce1d28;hb=93a5304ef04620630cbd6de14694607048bf2aa3;hp=20a536a4553ec25d2813478b3963123fe5e31bf6;hpb=e47a8ddb18b82790e048d312170c643c3a251dd8;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 20a536a45..788da938b 100755
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -45,40 +45,18 @@ do
     tools_variables=${tools_variables}" -v ${MININETIP}:${!MININETIP}"
 done
 
-echo "Locating test plan to use..."
-testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
-if [ ! -f "${testplan_filepath}" ]; then
-    testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
-fi
-
-echo "Changing the testplan path..."
-cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
-cat testplan.txt
-
-# Use the testplan if specific SUITES are not defined.
-if [ -z "${SUITES}" ]; then
-    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
-else
-    newsuites=""
-    workpath="${WORKSPACE}/test/csit/suites"
-    for suite in ${SUITES}; do
-        fullsuite="${workpath}/${suite}"
-        if [ -z "${newsuites}" ]; then
-            newsuites+=${fullsuite}
-        else
-            newsuites+=" "${fullsuite}
-        fi
-    done
-    SUITES=${newsuites}
-fi
+get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} \
+robot -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 CONTROLLER_USER:${USER} \
+      -v GERRIT_BRANCH:${GERRIT_BRANCH} \
+      -v GERRIT_PROJECT:${GERRIT_PROJECT} \
+      -v GERRIT_REFSPEC:${GERRIT_REFSPEC} \
       -v JAVA_HOME:${JAVA_HOME} \
       -v JDKVERSION:${JDKVERSION} \
       -v JENKINS_WORKSPACE:${WORKSPACE} \