X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=48eb744317dcd7b7617ba3fab3a211732892bd48;hb=refs%2Fchanges%2F96%2F37696%2F5;hp=19f321b9e6f9d0fb8960f5595985f0129d040117;hpb=b6398c4db8ab042b2e34e8328ed6a731fa46be51;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 19f321b9e..48eb74431 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -38,13 +38,29 @@
             default: '{controller-features}'
             description: 'Features to install in the controller separated by comma'
 
+- parameter:
+    name: integration-distribution-stream
+    parameters:
+        - string:
+            name: DISTROSTREAM
+            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
@@ -85,6 +101,7 @@
             branches:
                 - 'origin/{branch}'
             skip-tag: true
+            shallow-clone: true
             choosing-strategy: 'gerrit'
 
 # Macro: integration-distribution-scm
@@ -102,6 +119,7 @@
             branches:
                 - 'origin/{branch}'
             skip-tag: true
+            shallow-clone: true
 
 # Macro: integration-trigger-patch-submitted
 # Operation: this macro sets a trigger for patch submitted on a path pattern
@@ -222,9 +240,20 @@
             !include-raw:
                 - include-raw-integration-get-bundle-vars.sh
 
+# Macro: integration-distribution-check
+# Operation: this macro deploys the controller with all fetures
+# Used by: {project}-distribution-check-{stream} job template
+
+- builder:
+    name: integration-distribution-check
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-distribution-check.sh
+
 # Macro: integration-deploy-controller-verify
 # Operation: this macro deploys the controller with all fetures
-# Used by: integration-distrbution-deploy-{stream} job template
+# Used by: integration-distribution-deploy-{stream} job template
 
 - builder:
     name: integration-deploy-controller-verify
@@ -255,16 +284,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