Add test-suites option to run specific suites

Change-Id: I7aba5c1ecdfd4b64e5d1f35555ba05133f7ec4fd
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 72d36b2aeee3c7989855b48ca2ea4e60f61b8c6e..0ae2bd2522bdb3823836170e833cd7dc880947bc 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -821,7 +821,9 @@ 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' ' '`
+if [ -z "${SUITES}" ]; then
+    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+fi
 
 #Environment Variables Needed to execute Openstack Client for NEtvirt Jobs
 cat > /tmp/os_netvirt_client_rc << EOF

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index a7bea22a49013158ff19fdd150c254bab716f4a1..8af8e690d1db17525168d5d8262082579124e9ca 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -87,6 +87,17 @@
           default: '{test-plan}'
           description: 'General test plan we will run unless stream-specific one is found'
 
+- parameter:
+    name: integration-test-suites
+    parameters:
+      - string:
+          name: SUITES
+          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
+              integration/test/csit/suites/netvirt/ElanService/).
+
 - parameter:
     name: integration-test-options
     parameters:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index cf0525e290eb2d45517e014c0f928aca447d6ae5..15aad57ec04f53073e8e02a03656dacc29f02dd5 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1013,6 +1013,8 @@
           test-options: '{robot-options}'
       - integration-test-plan:
           test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -1200,6 +1202,8 @@
           test-options: '{robot-options}'
       - integration-test-plan:
           test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index d9cea002fdab5e4d1827a74fe891da0b9bbf9cf2..eb2e88d2f118c0dad2614c53ee71e382c0ed16ca 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -77,6 +77,7 @@
     robot-options: ''
     trigger-jobs: ''
     debug-map: ''
+    test-suites: ''
 
     # Data for csit-verify jobs
     # Branch for "last" version detection