Merge "Rename to taglist.log so that it gets archived"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index b17eb4dabf36e76f01a43df1ea6b551340b147d6..aed030ec35bc2a4bf2c775f224697ee77ea4717e 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -46,12 +46,20 @@
             default: '{test-options}'
             description:  'Robot command options'
 
+- parameter:
+    name: integration-patch-git-url
+    parameters:
+        - string:
+            name: PATCHGITURL
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
+            description:  'Patch GIT URL (do not modify)'
+
 - scm:
     name: integration-gerrit-scm
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
+            url: '$PATCHGITURL'
             basedir: '$GERRIT_PROJECT'
             refspec: '$GERRIT_REFSPEC'
             branches:
@@ -210,6 +218,21 @@
                 count: '{mininet-vms}'
                 stop-on-terminate: False
 
+- wrapper:
+    name: integration-jclouds-controller-fedora-mininet
+    wrappers:
+      - jclouds:
+          instances:
+            - rk-c-el6-java:
+                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                count: '{controller-vms}'
+                stop-on-terminate: False
+            - rk-f21-mininet:
+                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                count: '{mininet-vms}'
+                stop-on-terminate: False
+
+
 #################
 # Shell Scripts #
 #################
@@ -219,12 +242,35 @@
     builders:
         - shell:
             !include-raw include-raw-integration-get-slave-addresses.sh
+- builder:
+    name: integration-get-bundle-vars
+    builders:
+        - shell:
+            !include-raw include-raw-integration-get-bundle-vars.sh
 
 - builder:
     name: integration-deploy-controller-run-test
     builders:
         - shell:
             !include-raw include-raw-integration-deploy-controller-run-test.sh
+- builder:
+    name: integration-deploy-controller
+    builders:
+        - shell:
+            !include-raw include-raw-integration-deploy-controller.sh
+
+
+- builder:
+    name: integration-configure-clustering
+    builders:
+        - shell:
+            !include-raw include-raw-integration-configure-clustering.sh
+
+- builder:
+    name: integration-start-cluster-run-test
+    builders:
+        - shell:
+            !include-raw include-raw-integration-start-cluster-run-test.sh
 
 - builder:
     name: integration-deploy-controller-offline