Simplify val-autorelease and distro-check state definition

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index da2da40d0d2431ee6c255f937359f6c1cba09287..83daad88bdfbfe1b864d2540a43452f326453463 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -256,6 +256,21 @@
               template-name: '{openstack-image}'
               count: '{openstack-vms}'
 
+# Macro: integration-jclouds-controller-docker
+# Operation: this macro will sping the controller and docker vms
+# Used by: {project}-csit-docker job templates
+- wrapper:
+    name: integration-jclouds-controller-docker
+    wrappers:
+      - jclouds:
+          instances:
+            - '{controller-image}':
+                cloud-name: 'ODLPUB'
+                count: '{controller-vms}'
+            - '{docker-image}':
+                cloud-name: 'ODLPUB'
+                count: '{docker-vms}'
+
 #################
 # Shell Scripts #
 #################
@@ -517,7 +532,7 @@
                     mkdir $WORKSPACE/archives
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d $WORKSPACE/archives robot-plugin.zip
-                    mv *log* *.log *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
+                    mv *log* *.log *.log.gz *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True