X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=4e2ccf0de917121a68700a164963f25d0c4ba7d0;hb=d7c3880fe4578a70a16e2237bb8be8a1742c0291;hp=8ee7f0b50abb9a60cdf0b9349d5956ecf1e877e4;hpb=22151310cb7c9d2de7140e71fb6de3dd6aa3c018;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 8ee7f0b50..4e2ccf0de 100644
--- 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,18 @@
           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.
+              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:
     name: integration-test-options
     parameters:
@@ -99,6 +123,14 @@
           default: '{branch}'
           description: 'Integration Patch Refspec'
 
+- parameter:
+    name: integration-use-features-boot
+    parameters:
+      - string:
+          name: USEFEATURESBOOT
+          default: '{use-features-boot}'
+          description: 'Boolean to toggle whether featuresBoot is appended or ignored'
+
 # Macro: integration-gerrit-scm
 # Operation: this macro downloads a project gerrit
 # Used by: all csit jobs
@@ -138,7 +170,7 @@
 # in order to prevent Jenkins from starting only a subset and still voting Verified+1.
 # Contrary to gerrit-trigger-patch-submitted, this votes +1 also on unstable runs.
 # Arguments:
-#     server: name of gerrit server to listen to
+#     gerrit-server-name: name of gerrit server to listen to
 #     project: pattern to match triggering projects
 #     branch: triggering branch name
 #     files: pattern to match triggering filepaths
@@ -146,7 +178,7 @@
     name: integration-trigger-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
@@ -311,7 +343,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
@@ -335,36 +367,6 @@
       - inject:
           properties-file: detect_variables.env
 
-- builder:
-    name: integration-distribution-check
-    # Operation: Locally deploy ODL with all fetures, check it is not broken.
-    # Required bash variables:
-    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
-    #     Use distribution-karaf-version macro to customize.
-    builders:
-      - integration-set-variables
-      - shell: !include-raw: integration-distribution-check.sh
-
-- builder:
-    name: distribution-deploy-verify
-    # Operation: Deploy ODL with all fetures and check it is not broken.
-    # Required bash variables:
-    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
-    #     Use distribution-karaf-version macro to customize.
-    builders:
-      - integration-detect-variables
-      - shell: !include-raw: distribution-deploy-verify.sh
-
-- builder:
-    name: distribution-deploy-offline
-    # Operation: Deploys ODL on the current system, with no external repo configuration, check it works.
-    # Required bash variables:
-    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
-    #     Use distribution-karaf-version macro to customize.
-    builders:
-      - integration-detect-variables
-      - shell: !include-raw: distribution-deploy-offline.sh
-
 # Macro: integration-deply-controller-run-test
 # Operation: this macro deploys single contoller and runs test
 # Used by: {project}-csit-1node-* job templates
@@ -372,7 +374,9 @@
 - builder:
     name: integration-deploy-controller-run-test
     builders:
-      - shell: !include-raw: include-raw-integration-deploy-controller-run-test.sh
+      - shell: !include-raw:
+          - common-functions.sh
+          - integration-deploy-controller-run-test.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -381,7 +385,9 @@
 - builder:
     name: integration-configure-clustering
     builders:
-      - shell: !include-raw: include-raw-integration-configure-clustering.sh
+      - shell: !include-raw:
+          - common-functions.sh
+          - integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
@@ -390,7 +396,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 +405,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 +414,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 +432,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 +441,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 +457,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
@@ -546,10 +517,14 @@
           builders:
             - shell: |
                 #!/bin/bash
-                mkdir -p $WORKSPACE/archives
+                cd $WORKSPACE
+                mkdir -p ./archives
                 curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
-                unzip -d $WORKSPACE/archives robot-plugin.zip
-                mv *log* *.log *.log.gz *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
+                unzip -d ./archives robot-plugin.zip
+                mv *log* *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
+                # TODO: Can the following line ever fail?
+                find . -type f -name *.hprof -print0 | tar -cvf - --null -T - | xz -9 > ./archives/hprof.tar.xz
+                # TODO: Tweak the compression level if better ratio (or speed) is needed.
           script-only-if-succeeded: 'False'
           script-only-if-failed: 'False'
           mark-unstable-if-failed: 'True'