Merge "Archive dependency trees in distribution related jobs"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 032b21437f2465118e98c1ab2ac000583469ab66..806bcfc01656e8bc0bda31dbd27cc4d9c21b7edf 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -94,7 +94,7 @@
     name: integration-gerrit-scm
     scm:
         - git:
-            credentials-id: '{credentials-id}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             basedir: '{basedir}'
             refspec: '{refspec}'
@@ -111,7 +111,7 @@
     name: integration-distribution-scm
     scm:
         - git:
-            credentials-id: '{credentials-id}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             basedir: 'distribution'
             url: '$DISTROGITURL'
             refspec: ''
@@ -194,40 +194,36 @@
     triggers:
         - timed: 'H H * * *'
 
-# Macro: integration-jclouds-controller-mininet
+# Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates
 
 - wrapper:
-    name: integration-jclouds-controller-mininet
+    name: integration-openstack-controller-mininet
     wrappers:
-      - jclouds:
+      - openstack:
           instances:
-            - rk-c7-java:
-                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
-                count: '{controller-vms}'
-                stop-on-terminate: False
-            - '{mininet-image}':
-                cloud-name: '{mininet-cloud-name}'
-                count: '{mininet-vms}'
-                stop-on-terminate: False
-
-# Macro: integration-jclouds-controller-devstack
+            - cloud-name: 'ODLRPC'
+              template-name: '{controller-image}'
+              count: '{controller-vms}'
+            - cloud-name: 'ODLRPC'
+              template-name: '{mininet-image}'
+              count: '{mininet-vms}'
+
+# Macro: integration-openstack-controller-devstack
 # Operation: this macro will spin the controller and devstack vms
 # Used by: {project}-csit-openstack job templates
 - wrapper:
-    name: integration-jclouds-controller-devstack
+    name: integration-openstack-controller-devstack
     wrappers:
-      - jclouds:
+      - openstack:
           instances:
-            - rk-c7-java:
-                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
-                count: '{controller-vms}'
-                stop-on-terminate: False
-            - rk-c7-devstack:
-                cloud-name: 'Rackspace DFW - Devstack'
-                count: '{openstack-vms}'
-                stop-on-terminate: False
+            - cloud-name: 'ODLRPC'
+              template-name: '{controller-image}'
+              count: '{controller-vms}'
+            - cloud-name: 'ODLRPC'
+              template-name: '{openstack-image}'
+              count: '{openstack-vms}'
 
 #################
 # Shell Scripts #
@@ -336,17 +332,6 @@
             !include-raw:
                 - include-raw-integration-deploy-controller-run-test.sh
 
-# Macro: include-raw-integration-deploy-robot-testing
-# Operation: this macro only resolves suite path from testplan
-# Used by: {project}-openstack-{functionality}-daily-{openstack}-{odl} job templates
-
-- builder:
-    name: include-raw-integration-deploy-devstack-testing
-    builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-devstack-testing.sh
-
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
 # Used by: {project}-csit-3node-* job templates
@@ -469,3 +454,18 @@
             unstable-threshold: '{unstable-if}'
             pass-threshold: '{pass-if}'
             only-critical: false
+
+- publisher:
+    name: integration-csit-archive-build
+    publishers:
+        - postbuildscript:
+            builders:
+                - shell: |
+                    #!/bin/bash
+                    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 $WORKSPACE/archives || true  # Don't fail if file missing
+            script-only-if-succeeded: False
+            script-only-if-failed: False
+            mark-unstable-if-failed: True