X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=9a82329ce51e6850a6eec26cd1a201744aee358b;hb=deeed22e1fa4e36016e36889ac54e278b9bb4296;hp=8775f275217b71832ef0d13f0a66d39f48b0c6bb;hpb=e233ae832910a27e0d0ef21d9e59a53dcf3dd5aa;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 8775f2752..9a82329ce 100644
--- 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:
@@ -150,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
@@ -194,9 +222,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
@@ -334,7 +373,8 @@
     name: integration-rebase-gerrit-patch
     builders:
         - shell:
-            !include-raw include-raw-integration-rebase-gerrit-patch.sh
+            !include-raw:
+                - include-raw-integration-rebase-gerrit-patch.sh
 
 ##############
 # Publishers #