Merge "Auto Update CSIT Jobs to run for carbon"

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index d805016d588b53b11dd531a927b780f0166fd460..8af8e690d1db17525168d5d8262082579124e9ca 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -51,6 +51,18 @@
           default: '{controller-features}'
           description: 'Features to install in the controller separated by comma'
 
+- parameter:
+    name: integration-controller-debug-map
+    parameters:
+      - string:
+          name: CONTROLLERDEBUGMAP
+          default: '{controller-debug-map}'
+          description: |
+              Key:Value map of debugs to enable on the controller separated by spaces.
+              The module should not include org.opendaylight.
+              The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
+              (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
+
 - parameter:
     name: integration-distribution-stream
     parameters:
@@ -75,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:
@@ -442,41 +465,6 @@
     builders:
       - shell: !include-raw: integration-deploy-openstack-run-test.sh
 
-# Macro: integration-list-jobs
-# Operation: queries Jenkins jobs from jenkins.opendaylight.org and
-#   writes a list of the jobs corresponding to the search terms to a file.
-# Used by: builder-merge job template
-#
-# This script requires the following JJB variables to be passed in:
-#   {search_string}     Job type to act as a primary filter (e.g. csit)
-#   {blacklist}         List of sub-projects to filter out (e.g. longevity)
-#   {stream}            Development release name (e.g. boron)
-#   {jobs-filename}     Filename to write list into (e.g. carbon-jobs.lst)
-# NOTE: Requires xmlstarlet installed on node.
-
-- builder:
-    name: integration-list-jobs
-    builders:
-      - shell: !include-raw: integration-list-jobs.sh
-
-# Macro: integration-replace-block-text
-# Operation: using starting and ending regex to
-# replace a block of text in a file with the text in
-# another file. Regex should be basic and work with sed
-# Used by: builder-merge job template
-#
-# This script requires the following JJB variables to be passed in:
-#   {starting-regex}
-#   {ending-regex}
-#   {file-with-changes-to-insert}
-#   {file-to-change}
-
-- builder:
-    name: integration-replace-block-text
-    builders:
-      - shell: !include-raw: integration-replace-block-text.sh
-
-
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last