X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=d43905b74e962704c9f7f7e91ceb640f55decef6;hb=755df2529e71a80299c0036b61eb5464d40133a3;hp=496db36580b67e2093279ef94d95365fca8f7e80;hpb=4dffa1f9fc8e27f08697d7a79927f5c716cf0e8c;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 496db3658..d43905b74 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -46,13 +46,21 @@
             default: '{stream}'
             description: 'Distribution stream string, for suites to know which behavior to expect'
 
+- parameter:
+    name: integration-stream-test-plan
+    parameters:
+        - string:
+            name: STREAMTESTPLAN
+            default: '{stream-test-plan}'
+            description: 'Stream-specific test plan we will run'
+
 - parameter:
     name: integration-test-plan
     parameters:
         - string:
             name: TESTPLAN
             default: '{test-plan}'
-            description: 'Test plan we will run'
+            description: 'General test plan we will run unless stream-specific one is found'
 
 - parameter:
     name: integration-test-options
@@ -204,6 +212,23 @@
                 count: '{mininet-vms}'
                 stop-on-terminate: False
 
+# Macro: integration-jclouds-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
+    wrappers:
+      - jclouds:
+          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
+
 #################
 # Shell Scripts #
 #################
@@ -274,16 +299,16 @@
             !include-raw:
                 - include-raw-integration-deploy-controller-run-test.sh
 
-# Macro: integration-deploy-controller
-# Operation: this macro prepares 3-node cluster controller
-# Used by: {project}-csit-3node-* job templates
+# 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: integration-deploy-controller
+    name: include-raw-integration-deploy-devstack-testing
     builders:
         - shell:
             !include-raw:
-                - include-raw-integration-deploy-controller.sh
+                - include-raw-integration-deploy-devstack-testing.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -384,6 +409,12 @@
             !include-raw:
                 - include-raw-integration-rebase-gerrit-patch.sh
 
+- builder:
+    name: integration-deploy-openstack-run-test
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-deploy-openstack-run-test.sh
 ##############
 # Publishers #
 ##############