Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 3409de3912ebbe7a9ffb8cd5f2d0390c9f401976..77e92a4cc80c0ef8cbe8faaa50ff8b5a74cc3117 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:
@@ -122,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
@@ -430,10 +439,21 @@
     builders:
       - shell: !include-raw: integration-rebase-gerrit-patch.sh
 
+# Macro: integration-install-common-functions
+# Operation: Copy the common-functions.sh script to csit nodes
+# Used by: {project}-csit-* job templates
+- builder:
+    name: integration-install-common-functions
+    builders:
+      - shell: !include-raw:
+          - copy-common-functions.sh
+          - common-functions.sh
+
 - builder:
     name: integration-deploy-openstack-run-test
     builders:
-      - shell: !include-raw: integration-deploy-openstack-run-test.sh
+      - shell: !include-raw:
+          - integration-deploy-openstack-run-test.sh
 
 - builder:
     name: integration-compare-distributions
@@ -508,7 +528,7 @@
                 mkdir -p ./archives
                 curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                 unzip -d ./archives robot-plugin.zip
-                mv *log* *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
+                mv *.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.