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 bbf9fe7992e983f9ddafc594aba1b8520ba2f69f..aed030ec35bc2a4bf2c775f224697ee77ea4717e 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -218,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 #
 #################
@@ -227,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