Merge "Bug 6926: Unify verify triggers and improve trigger words"

diff --combined jjb/releng-macros.yaml
index c2ca83a74ca20090737a9695e86d167e66c2b493,05c9eaab14ce353588b8aaa5ee7dc681bd584734..873d5ce52bf54ddcc7affdc2b403340a2ce240ba
--- 1/jjb/releng-macros.yaml
--- 2/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@@ -126,30 -126,9 +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,19 -169,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
@@@ -239,19 -205,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