Merge "BUG-2625: enable JDK8 verification for sfc"

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 46f7cba83876cd0f98fce64006e2338857815b63..84bb39e69a763990c9480c12ec396cbc656a11d7 100644 (file)
--- 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,25 @@
         - 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
@@ -269,6 +289,15 @@
         - 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
 
 ##############
 # Publishers #