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 8ee7f0b50abb9a60cdf0b9349d5956ecf1e877e4..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:
@@ -311,7 +334,7 @@
 - builder:
     name: integration-get-slave-addresses
     builders:
-      - shell: !include-raw: include-raw-integration-get-slave-addresses.sh
+      - shell: !include-raw: integration-get-slave-addresses.sh
 
 - builder:
     name: integration-set-variables
@@ -372,7 +395,7 @@
 - builder:
     name: integration-deploy-controller-run-test
     builders:
-      - shell: !include-raw: include-raw-integration-deploy-controller-run-test.sh
+      - shell: !include-raw: integration-deploy-controller-run-test.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -381,7 +404,7 @@
 - builder:
     name: integration-configure-clustering
     builders:
-      - shell: !include-raw: include-raw-integration-configure-clustering.sh
+      - shell: !include-raw: integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
@@ -390,7 +413,7 @@
 - builder:
     name: integration-start-cluster-run-test
     builders:
-      - shell: !include-raw: include-raw-integration-start-cluster-run-test.sh
+      - shell: !include-raw: integration-start-cluster-run-test.sh
 
 # Macro: integration-install-robotframework
 # Operation: Installs robotframework using pip to a virtualenv
@@ -399,7 +422,7 @@
 - builder:
     name: integration-install-robotframework
     builders:
-      - shell: !include-raw: include-raw-integration-install-robotframework.sh
+      - shell: !include-raw: integration-install-robotframework.sh
 
 # Macro: integration-cleanup-tmp
 # Operation: Cleans up temporary files created by build
@@ -408,7 +431,7 @@
 - builder:
     name: integration-cleanup-tmp
     builders:
-      - shell: !include-raw: include-raw-integration-cleanup-tmp.sh
+      - shell: !include-raw: integration-cleanup-tmp.sh
 
 # Macro: integration-multipatch-builder
 # Operation: checks out multiple patches and builds custom distribution
@@ -426,7 +449,7 @@
 - builder:
     name: integration-cleanup-workspace
     builders:
-      - shell: !include-raw: include-raw-integration-cleanup-workspace.sh
+      - shell: !include-raw: integration-cleanup-workspace.sh
 
 # Macro: integration-rebase-patch
 # Operation: For cloned project, rebase checked-out Gerrit patch onto $DISTROBRANCH.
@@ -435,47 +458,12 @@
 - builder:
     name: integration-rebase-gerrit-patch
     builders:
-      - shell: !include-raw: include-raw-integration-rebase-gerrit-patch.sh
+      - shell: !include-raw: integration-rebase-gerrit-patch.sh
 
 - builder:
     name: integration-deploy-openstack-run-test
     builders:
-      - shell: !include-raw: 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: 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: include-raw-integration-replace-block-text.sh
-
+      - shell: !include-raw: integration-deploy-openstack-run-test.sh
 
 - builder:
     name: integration-compare-distributions
@@ -486,7 +474,7 @@
     # Required bash variables:
     #   KARAF_ARTIFACT: 'karaf' or 'distribution-karaf'. Use integration-set-variables.
     builders:
-      - shell: !include-raw: include-raw-integration-compare-distributions.sh
+      - shell: !include-raw: integration-compare-distributions.sh
 
 - builder:
     name: integration-upload-distribution