X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-start-cluster-run-test.sh;h=4ce0682170e8090514dd09e8a31506b231b22180;hb=97b12b4b42c91a67e3743667f59970ec0d744ee0;hp=9b756e14aa1a8da43119f703dda21595fac61cfe;hpb=2c18f845ed77f3fbbc022aaec4858f796f996087;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh index 9b756e14a..4ce068217 100644 --- a/jjb/integration/integration-start-cluster-run-test.sh +++ b/jjb/integration/integration-start-cluster-run-test.sh @@ -112,7 +112,22 @@ echo "Changing the testplan path..." cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt cat testplan.txt -SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '` +# 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 echo "Starting Robot test suites ${SUITES} ..." pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} \