Merge "Organize pybot args"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 7fa75f3c2237bc3ea33786be0c4d7db235754c1b..77e92a4cc80c0ef8cbe8faaa50ff8b5a74cc3117 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -439,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
@@ -517,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.