Merge "Use lf-infra-pre-build for openstack & lftools"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 2ab9bb4fc9aa28687f0ebfa9ebfff99cd2c3e6e5..abbd7f6632612ca93c131b0b394d31f1d4735435 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -479,6 +479,12 @@
       - shell: !include-raw:
           - integration-deploy-openstack-run-test.sh
 
+- builder:
+    name: integration-apex-image-manager
+    builders:
+      - shell: !include-raw:
+          - ../opendaylight-infra-apex-image-management.sh
+
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last
@@ -556,14 +562,16 @@
               build-steps:
                 - shell: |
                     #!/bin/bash
+                    echo "Archiving csit artifacts"
                     cd $WORKSPACE
                     mkdir -p ./archives
                     for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
                         NODE_FOLDER="./archives/odl_${i}"
                         mkdir -p ${NODE_FOLDER}
-                        mv odl${i}_karaf* ${NODE_FOLDER} || true
+                        mv odl${i}_* ${NODE_FOLDER} || true
                         mv karaf_${i}_*_threads* ${NODE_FOLDER} || true
                         mv *_${i}.png ${NODE_FOLDER} || true
+                        mv /tmp/odl${i}_* ${NODE_FOLDER} || true
                     done
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d ./archives robot-plugin.zip