X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=c7e397cba19c77f43cf059f134c7b6779b884315;hb=115d5c4ae452b0c16ae2561aebd5362b1db3cf64;hp=8ded79d1ca7057bbd11962fb09cccea8b21b59f9;hpb=7ab3fd784625b957216cdb7ba4866effe0daea2a;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 8ded79d1c..c7e397cba 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -126,30 +126,9 @@
             timeout: 360
             fail: true
 
+# Used only by opflex-verify-{stream} and {project-name}-verify-{stream}-{maven}-{jdks}
 - trigger:
     name: gerrit-trigger-patch-submitted
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-
-- trigger:
-    name: gerrit-trigger-relevant-patch-submitted
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'
@@ -190,6 +169,19 @@
                 failed: true
                 unstable: true
                 notbuilt: true
+            # Force Jenkins always vote the values it should already have voted
+            # during the prior verify phase
+            override-votes: true
+            gerrit-build-started-verified-value: 1
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 1
+            gerrit-build-unstable-verified-value: 1
+            gerrit-build-notbuilt-verified-value: 1
+            gerrit-build-started-codereview-value: 0
+            gerrit-build-successful-codereview-value: 0
+            gerrit-build-failed-codereview-value: 0
+            gerrit-build-unstable-codereview-value: 0
+            gerrit-build-notbuilt-codereview-value: 0
 
 - trigger:
     name: gerrit-trigger-patch-sonar
@@ -226,6 +218,19 @@
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+            # Force Jenkins always vote the values it should already have voted
+            # during the prior verify phase
+            override-votes: true
+            gerrit-build-started-verified-value: 1
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 1
+            gerrit-build-unstable-verified-value: 1
+            gerrit-build-notbuilt-verified-value: 1
+            gerrit-build-started-codereview-value: 0
+            gerrit-build-successful-codereview-value: 0
+            gerrit-build-failed-codereview-value: 0
+            gerrit-build-unstable-codereview-value: 0
+            gerrit-build-notbuilt-codereview-value: 0
 
 - publisher:
     name: archive-artifacts
@@ -240,7 +245,7 @@
     name: email-notification
     publishers:
         - email-ext:
-            recipients: 'jenkins@lists.opendaylight.org'
+            recipients: '{email-recipients}'
             reply-to: ''
             content-type: default
             subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'