From 66786f9e2e9fe1dc284dd884e8e7727856d8c306 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Fri, 7 Oct 2016 10:02:44 -0700 Subject: Force Jenkins to not change votes on merge Make sure that Jenkins doesn't try to change it's vote during any phase of a merge job. Change-Id: I072e7b73a9a6a68e744527d27094b4a0126076e6 Signed-off-by: Andrew Grimberg --- jjb/global-macros.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'jjb/global-macros.yaml') diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 7f20ada89..1745da037 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -168,14 +168,19 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - # Force Jenkins to pass the same "expected" votes during start + # 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 - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + 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 # Publishers - publisher: -- cgit 1.2.3-korg