X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=3171341aadaad81d441c41d4f0fff3c04a124cef;hb=6f286ffab2dbbba04e83ecc8ced0930010ba60ef;hp=4511132b4e8b68dd2e1e930f57cc5b8a9d5280ae;hpb=0023b8933880f4e6428f1cc4a5445470116a9f7d;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 4511132b4..3171341aa 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -1,8 +1,11 @@
+# TODO: Make all bash constants more readable.
+# e.g.: DISTRIBUTION_BRANCH instead of DISTROBRANCH.
+
 - parameter:
-    name: integration-branch
+    name: integration-distribution-branch
     parameters:
         - string:
-            name: BRANCH
+            name: DISTROBRANCH
             default: '{branch}'
             description: 'Distribution GIT branch'
 
@@ -217,6 +220,36 @@
         - opendaylight-infra-stack:
             stack-template: '{stack-template}'
 
+# Macro: integration-infra-stack-3-type
+# Operation: Sets environment and then calls opendaylight-infra-stack to spin
+#            up csit lab using openstack-heat.
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-infra-stack-3-type
+    builders:
+        - integration-cleanup-workspace
+        - shell: |
+            #!/bin/bash
+            # Setup openstack envirnoment file for use by
+            # the opendaylight-infra-stack macro
+            cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
+            parameters:
+                vm_0_count: {vm_0_count}
+                vm_0_flavor: {vm_0_flavor}
+                vm_0_image: {vm_0_image}
+                vm_1_count: {vm_1_count}
+                vm_1_flavor: {vm_1_flavor}
+                vm_1_image: {vm_1_image}
+                vm_2_count: {vm_2_count}
+                vm_2_flavor: {vm_2_flavor}
+                vm_2_image: {vm_2_image}
+            EOF
+            echo "Contents of opendaylight-infra-environment.yaml ..."
+            cat $WORKSPACE/opendaylight-infra-environment.yaml
+        - opendaylight-infra-stack:
+            stack-template: 'csit-3-instance-type.yaml'
+
 # Macro: integration-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms
 # Used by: {project}-csit-* job templates
@@ -252,7 +285,7 @@
 
 # Macro: integration-deploy-controller-verify
 # Operation: this macro deploys the controller with all fetures
-# Used by: integration-distribution-deploy-{stream} job template
+# Used by: distribution-deploy-{stream} job template
 
 - builder:
     name: integration-deploy-controller-verify
@@ -318,7 +351,7 @@
 
 # Macro: integration-get-bundle-url-root
 # Operation: this macro gets the job generated distribution URL from root pom.xml
-# Used by: integration-distribution-verify-{stream} job template
+# Used by: distribution-verify-{stream} job template
 
 - builder:
     name: integration-get-bundle-url-root
@@ -372,7 +405,7 @@
                 - include-raw-integration-cleanup-workspace.sh
 
 # Macro: integration-rebase-patch
-# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH.
+# Operation: For cloned project, rebase checked-out Gerrit patch onto $DISTROBRANCH.
 # Used by: integration-patch-distribution-* job template
 
 - builder:
@@ -399,6 +432,7 @@
 #   {blacklist}         List of sub-projects to filter out (e.g. longevity)
 #   {stream}            Development release name (e.g. boron)
 #   {jobs-filename}     Filename to write list into (e.g. carbon-jobs.lst)
+# NOTE: Requires xmlstarlet installed on node.
 
 - builder:
     name: integration-list-jobs
@@ -426,6 +460,24 @@
             !include-raw:
                 - include-raw-integration-replace-block-text.sh
 
+# Macro: integration-compare-distributions
+# Operation: will compare an already created distribtion (probably last
+# published to nexus) to the current distribution being created.
+# The comparison is done to find the list of patches that are new to the
+# current distribtion.
+# Used by: builder-merge job template
+#
+# This script requires the bundle vars that are created by the
+# get-bundle-vars macro script
+
+
+- builder:
+    name: integration-compare-distributions
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-compare-distributions.sh
+
 ##############
 # Publishers #
 ##############