allow shorter suite paths

Change-Id: I3e621fd3e294de251f0b2db6c5d39405f6798e36
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 800b1c9e8a8429ddf22796e58b7156e91f776fe3..e0ccfb285c7be73343f23913509b0716e190d6d0 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -1089,6 +1089,18 @@ 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
 
 # TODO: run openrc on control node and then scrape the vars from it

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 3409de3912ebbe7a9ffb8cd5f2d0390c9f401976..40f75ed4bdeda1c5eaec681e9d1b674e81828c9d 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -95,7 +95,8 @@
           default: '{test-suites}'
           description: |
               List of space-separated suites. Useful when running specific suites within a testplan.
-              (ex. integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot
+              Do not include ${{WORKSPACE}}/test/csit/suites/ in the values:
+              (ex. openstack/connectivity/l2.robot openstack/tempest/tempest.robot
               integration/test/csit/suites/netvirt/ElanService/).
 
 - parameter: