X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=83daad88bdfbfe1b864d2540a43452f326453463;hb=e5ebb1faf1e71657113c709ef811a25242780862;hp=da2da40d0d2431ee6c255f937359f6c1cba09287;hpb=2a8744f668e76ecda6b4f579fa9cc01da649963b;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index da2da40d0..83daad88b 100644
--- 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