From e8386a2101065ca9234d934035f8ec1a68c18cf7 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Fri, 7 Oct 2016 09:51:12 -0700 Subject: Force Jenkins to not change it's votes for merge Jenkins by default resets the votes it has in Gerrit to 0. Gerrit 2.13 has problems with this and causes us to catch an error. As such, we should make sure that Jenkins does not try to change its votes when it starts during a merge job. We assume that any merge run will be with our normal mechanically set votes. Change-Id: Ia45eb7ca605ee904f211065a2877fc0cc1ee5f42 Signed-off-by: Andrew Grimberg --- jjb/global-macros.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'jjb/global-macros.yaml') diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index de087dceb..7f20ada89 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -168,6 +168,9 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + # Force Jenkins to pass the same "expected" votes during start + override-votes: true + gerrit-build-started-verified-value: 1 skip-vote: successful: true failed: true -- cgit 1.2.3-korg