refactor email recipients to parameter with default value

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 7b7b7aef1de7269925602abb0360f4f05deeb1da..9904fa7b79fea124b0608c69afe17803bb41917c 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -55,6 +55,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -118,6 +119,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - maven-deploy:
             id: ''
@@ -164,7 +166,11 @@
 
     wrappers:
         - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            # Distro-check jobs typically run within 10 - 30 minutes
+            # with 45 minutes being the occassional edge case.
+            # enforce a 60 minute limit to ensure stuck jobs get
+            # cleared up sooner.
+            build-timeout: '60'
 
     triggers:
         - gerrit:
@@ -173,12 +179,10 @@
                 - patchset-created-event:
                     exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'test-distribution'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'redistcheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
             projects:
@@ -218,6 +222,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - postbuildscript:
             builders:
@@ -294,6 +299,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '{email-upstream}'
         - findbugs
         - jacoco-report
@@ -403,6 +409,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - maven-deploy:
             id: ''
@@ -467,6 +474,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
@@ -537,6 +545,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
@@ -597,8 +606,6 @@
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
                 - comment-added-contains-event:
                     comment-contains-value: 'revalidate'
             projects:
@@ -639,6 +646,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[autorelease] [{project-name}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -701,6 +709,7 @@
     publishers:
         - findbugs
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - opendaylight-infra-shiplogs: