X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=99a6db416bef26a5a52f0115e94fbc188b479855;hb=155844e741a1be71d19899a3faffb404fd873d27;hp=cd2c83ff5f2f67297fc87207c3c5aa2f5fcc47bf;hpb=66101f6a056072c6e00ca7dd59432ef8dc18fe72;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index cd2c83ff5..99a6db416 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -189,8 +189,28 @@
         - shell:
             !include-raw include-raw-integration-get-bundle-vars.sh
 
+# Macro: integration-deploy-controller-verify
+# Operation: this macro deploys the controller with all fetures
+# Used by: integration-distrbution-deploy-{stream} job template
+
+- builder:
+    name: integration-deploy-controller-verify
+    builders:
+        - shell:
+            !include-raw include-raw-integration-deploy-controller-verify.sh
+
+# Macro: integration-deploy-controller-offline
+# Operation: this macro deploys the controller with no external repo configuration
+# Used by: integration-distrbution-offline-{stream} job template
+
+- builder:
+    name: integration-deploy-controller-offline
+    builders:
+        - shell:
+            !include-raw include-raw-integration-deploy-controller-offline.sh
+
 # Macro: integration-deply-controller-run-test
-# Operation: this macro deployes single contoller and runs test
+# Operation: this macro deploys single contoller and runs test
 # Used by: {project}-csit-1node-* job templates
 
 - builder:
@@ -229,25 +249,65 @@
         - shell:
             !include-raw include-raw-integration-start-cluster-run-test.sh
 
-# Macro: integration-deploy-controller-offline
-# Operation: this macro deployes the controller with no external repo configuration
-# Used by: integration-distrbution-offline-{stream} job template
+# Macro: integration-get-bundle-url
+# Operation: this macro gets the job generated distribution URL from distribution pom.xml
+# Used by: integration-patch-test-{stream} job template
 
 - builder:
-    name: integration-deploy-controller-offline
+    name: integration-get-bundle-url
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller-offline.sh
+            !include-raw include-raw-integration-get-bundle-url.sh
 
-# Macro: integration-get-bundle-url
-# Operation: this macro gets the distribution bundle URL
-# Used by: integration-patch-test-{stream} job template
+# 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
 
 - builder:
-    name: integration-get-bundle-url
+    name: integration-get-bundle-url-root
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-url.sh
+            !include-raw include-raw-integration-get-bundle-url-root.sh
+
+# Macro: integration-install-robotframework
+# Operation: Installs robotframework using pip to a virtualenv
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-install-robotframework
+    builders:
+        - shell:
+            !include-raw include-raw-integration-install-robotframework.sh
+
+# Macro: integration-cleanup-tmp
+# Operation: Cleans up temporary files created by build
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-cleanup-tmp
+    builders:
+        - shell:
+            !include-raw include-raw-integration-cleanup-tmp.sh
+
+# Macro: integration-multipatch-builder
+# Operation: checks out multiple patches and builds custom distribution
+# Used by: integration-multipatch-test-* job templates
+
+- builder:
+    name: integration-multipatch-builder
+    builders:
+        - shell:
+            !include-raw include-raw-integration-multipatch-distribution-test.sh
+
+# Macro: integration-cleanup-worspace
+# Operation: Cleans up files possibly left there by the previous build
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-cleanup-workspace
+    builders:
+        - shell:
+            !include-raw include-raw-integration-cleanup-workspace.sh
 
 ##############
 # Publishers #