Do not provide JDKVERSION from distribution-test job

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 78d3b0561288be4075e8174c2655584e6f1534bd..9a82329ce51e6850a6eec26cd1a201744aee358b 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -14,6 +14,14 @@
             default: '{bundleurl}'
             description: 'URL to karaf distribution zip'
 
+- parameter:
+    name: integration-jdk-version
+    parameters:
+        - string:
+            name: JDKVERSION
+            default: '{jdkversion}'
+            description: 'Parameter to indicate JAVA Version'
+
 - parameter:
     name: integration-controller-scope
     parameters:
@@ -114,6 +122,9 @@
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
+            override-votes: true
+            gerrit-build-unstable-verified-value: +1
+            gerrit-build-unstable-codereview-value: 0
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -147,6 +158,26 @@
                   - compare-type: 'ANT'
                     pattern: '{pattern}'
 
+# Macro: integration-csit-only
+# Operation: this macro sets a trigger on reverse job list
+# Used by: csit -only- job templates
+
+- trigger:
+    name: integration-csit-only
+    triggers:
+        - reverse:
+            jobs: '{jobs}'
+            result: 'success'
+
+# Macro: integration-csit-all
+# Operation: this macro sets a periodic trigger
+# Used by: csit -all- job teamplates
+
+- trigger:
+    name: integration-csit-all
+    triggers:
+        - timed: 'H H * * *'
+
 # Macro: integration-jclouds-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates
@@ -177,7 +208,8 @@
     name: integration-get-slave-addresses
     builders:
         - shell:
-            !include-raw include-raw-integration-get-slave-addresses.sh
+            !include-raw:
+                - include-raw-integration-get-slave-addresses.sh
 
 # Macro: integration-get-bundle-vars
 # Operation: this macro gets all bundle related variables
@@ -187,17 +219,52 @@
     name: integration-get-bundle-vars
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-vars.sh
+            !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-distribution-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:
     name: integration-deploy-controller-run-test
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller-run-test.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller-run-test.sh
 
 # Macro: integration-deploy-controller
 # Operation: this macro prepares 3-node cluster controller
@@ -207,7 +274,8 @@
     name: integration-deploy-controller
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -217,7 +285,8 @@
     name: integration-configure-clustering
     builders:
         - shell:
-            !include-raw include-raw-integration-configure-clustering.sh
+            !include-raw:
+                - include-raw-integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
@@ -227,17 +296,8 @@
     name: integration-start-cluster-run-test
     builders:
         - 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
-
-- builder:
-    name: integration-deploy-controller-offline
-    builders:
-        - shell:
-            !include-raw include-raw-integration-deploy-controller-offline.sh
+            !include-raw:
+                - include-raw-integration-start-cluster-run-test.sh
 
 # Macro: integration-get-bundle-url
 # Operation: this macro gets the job generated distribution URL from distribution pom.xml
@@ -247,7 +307,8 @@
     name: integration-get-bundle-url
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-url.sh
+            !include-raw:
+                - include-raw-integration-get-bundle-url.sh
 
 # Macro: integration-get-bundle-url-root
 # Operation: this macro gets the job generated distribution URL from root pom.xml
@@ -257,7 +318,8 @@
     name: integration-get-bundle-url-root
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-url-root.sh
+            !include-raw:
+                - include-raw-integration-get-bundle-url-root.sh
 
 # Macro: integration-install-robotframework
 # Operation: Installs robotframework using pip to a virtualenv
@@ -267,7 +329,8 @@
     name: integration-install-robotframework
     builders:
         - shell:
-            !include-raw include-raw-integration-install-robotframework.sh
+            !include-raw:
+                - include-raw-integration-install-robotframework.sh
 
 # Macro: integration-cleanup-tmp
 # Operation: Cleans up temporary files created by build
@@ -277,8 +340,41 @@
     name: integration-cleanup-tmp
     builders:
         - shell:
-            !include-raw include-raw-integration-cleanup-tmp.sh
+            !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
+
+# Macro: integration-rebase-patch
+# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH.
+# Used by: integration-patch-distribution-* job template
+
+- builder:
+    name: integration-rebase-gerrit-patch
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-rebase-gerrit-patch.sh
 
 ##############
 # Publishers #