From ea98a194cc54d6766dfd0a14ab74b5dd045ccea6 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Mon, 29 May 2017 21:15:17 +0200 Subject: Case sensitive label matching After upgrading Gerrit to 2.13 our gate stopped working. The reason for this is that after a successful gate run zuul does something like 'gerrit review --label verified=2 --submit'. The verified label in Gerrit by default is configured as 'Verified'. The newer version of gerrit behaves different now. It accepts the +2 vote on verified but doesn't submit the patch anymore if the casing is not correct. This forces us to specify the label in the same casing as gerrit expects. In that case the tolower() in canMerge prevents the patch from entering the gate. In order to avoid confusion and be consistent, avoid any case conversions and use the labels exactly as defined in Gerrit. Note that this patch requires changes to the pipelines such that the labels are spelled exactly as defined in Gerrit. Change-Id: I9713a075e07b268e4f2620c0862c128158283c7c --- etc/layout.yaml-sample | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'etc') diff --git a/etc/layout.yaml-sample b/etc/layout.yaml-sample index 53f6ba19a..b84be1162 100644 --- a/etc/layout.yaml-sample +++ b/etc/layout.yaml-sample @@ -6,10 +6,10 @@ pipelines: - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: tests manager: IndependentPipelineManager @@ -19,10 +19,10 @@ pipelines: email_filter: ^.*@example.org$ success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: post manager: IndependentPipelineManager @@ -38,16 +38,16 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 start: gerrit: - verified: 0 + Verified: 0 success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 jobs: - name: ^.*-merge$ -- cgit v1.2.1