From ea98a194cc54d6766dfd0a14ab74b5dd045ccea6 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Mon, 29 May 2017 21:15:17 +0200 Subject: [PATCH] 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 --- doc/source/user/config.rst | 10 +++---- etc/layout.yaml-sample | 16 +++++----- tests/base.py | 23 ++++++++++---- .../ansible/git/common-config/zuul.yaml | 12 ++++---- .../config/broken/git/common-config/zuul.yaml | 4 +-- .../data-return/git/common-config/zuul.yaml | 4 +-- .../git/common-config/zuul.yaml | 8 ++--- .../git/common-config/zuul.yaml | 8 ++--- .../git-driver/git/common-config/zuul.yaml | 4 +-- .../git/common-config/zuul.yaml | 4 +-- .../in-repo/git/common-config/zuul.yaml | 20 ++++++------- .../inventory/git/common-config/zuul.yaml | 4 +-- .../config/merges/git/common-config/zuul.yaml | 12 ++++---- .../git/common-config/zuul.yaml | 4 +-- .../multi-tenant/git/common-config/zuul.yaml | 4 +-- .../git/tenant-one-config/zuul.yaml | 8 ++--- .../git/tenant-two-config/zuul.yaml | 8 ++--- .../openstack/git/project-config/zuul.yaml | 12 ++++---- .../pre-playbook/git/common-config/zuul.yaml | 4 +-- .../email/git/common-config/zuul.yaml | 8 ++--- .../newer-than/git/common-config/zuul.yaml | 8 ++--- .../older-than/git/common-config/zuul.yaml | 8 ++--- .../git/common-config/zuul.yaml | 8 ++--- .../reject/git/common-config/zuul.yaml | 16 +++++----- .../state/git/common-config/zuul.yaml | 12 ++++---- .../username/git/common-config/zuul.yaml | 8 ++--- .../vote1/git/common-config/zuul.yaml | 12 ++++---- .../vote2/git/common-config/zuul.yaml | 12 ++++---- .../config/roles/git/common-config/zuul.yaml | 12 ++++---- .../semaphore/git/common-config/zuul.yaml | 4 +-- .../semaphore/zuul-reconfiguration.yaml | 4 +-- .../config/shadow/git/local-config/zuul.yaml | 4 +-- .../single-tenant/git/common-config/zuul.yaml | 12 ++++---- .../git/common-config/zuul.d/pipelines.yaml | 4 +-- .../sql-driver/git/common-config/zuul.yaml | 4 +-- .../streamer/git/common-config/zuul.yaml | 4 +-- .../success-url/git/common-config/zuul.yaml | 4 +-- .../git/common-config/zuul.d/pipelines.yaml | 12 ++++---- .../tenant-parser/git/common-config/zuul.yaml | 4 +-- .../git/common-config/zuul.yaml | 16 +++++----- .../git/common-config/zuul.yaml | 4 +-- .../git/common-config/zuul.yaml | 16 +++++----- .../git/common-config/zuul.yaml | 14 ++++----- tests/fixtures/layout-cloner.yaml | 12 ++++---- tests/fixtures/layout-delayed-repo-init.yaml | 12 ++++---- tests/fixtures/layout-disable-at.yaml | 4 +-- ...layout-live-reconfiguration-functions.yaml | 8 ++--- tests/fixtures/layout-merge-queues.yaml | 2 +- tests/fixtures/layout-requirement-vote.yaml | 12 ++++---- tests/fixtures/layout-smtp.yaml | 4 +-- tests/fixtures/layout.yaml | 30 +++++++++---------- tests/fixtures/layouts/disable_at.yaml | 4 +-- tests/fixtures/layouts/footer-message.yaml | 8 ++--- .../fixtures/layouts/ignore-dependencies.yaml | 4 +-- tests/fixtures/layouts/inheritance.yaml | 4 +-- tests/fixtures/layouts/irrelevant-files.yaml | 4 +-- .../layouts/live-reconfiguration-add-job.yaml | 8 ++--- .../live-reconfiguration-del-project.yaml | 4 +-- .../live-reconfiguration-failed-job.yaml | 4 +-- .../live-reconfiguration-shared-queue.yaml | 12 ++++---- tests/fixtures/layouts/merge-failure.yaml | 14 ++++----- tests/fixtures/layouts/no-jobs-project.yaml | 4 +-- tests/fixtures/layouts/no-jobs.yaml | 12 ++++---- tests/fixtures/layouts/no-timer.yaml | 4 +-- tests/fixtures/layouts/nonvoting-job.yaml | 8 ++--- tests/fixtures/layouts/noop-job.yaml | 8 ++--- tests/fixtures/layouts/one-job-project.yaml | 12 ++++---- tests/fixtures/layouts/rate-limit.yaml | 8 ++--- .../layouts/repo-checkout-four-project.yaml | 12 ++++---- .../layouts/repo-checkout-six-project.yaml | 12 ++++---- .../layouts/repo-checkout-two-project.yaml | 12 ++++---- tests/fixtures/layouts/repo-deleted.yaml | 12 ++++---- tests/fixtures/layouts/smtp.yaml | 12 ++++---- tests/fixtures/layouts/tags.yaml | 4 +-- tests/fixtures/layouts/three-projects.yaml | 12 ++++---- tests/fixtures/layouts/timer.yaml | 4 +-- tests/fixtures/layouts/unmanaged-project.yaml | 6 ++-- tests/unit/test_connection.py | 4 +-- zuul/driver/gerrit/gerritconnection.py | 2 +- zuul/driver/gerrit/gerritmodel.py | 11 ++----- 80 files changed, 347 insertions(+), 341 deletions(-) diff --git a/doc/source/user/config.rst b/doc/source/user/config.rst index c1379183e0..6b63e496ca 100644 --- a/doc/source/user/config.rst +++ b/doc/source/user/config.rst @@ -115,10 +115,10 @@ success, the pipeline reports back to Gerrit with a *Verified* vote of - event: patchset-created success: my_gerrit: - verified: 1 + Verified: 1 failure: my_gerrit - verified: -1 + Verified: -1 .. TODO: See TODO for more annotated examples of common pipeline configurations. @@ -255,9 +255,9 @@ optional unless otherwise specified): to match. Same format as "older-than". Any other field is interpreted as a review category and value - pair. For example ``verified: 1`` would require that the approval + pair. For example ``Verified: 1`` would require that the approval be for a +1 vote in the "Verified" column. The value may either - be a single value or a list: ``verified: [1, 2]`` would match + be a single value or a list: ``Verified: [1, 2]`` would match either a +1 or +2 vote. **open** @@ -287,7 +287,7 @@ optional unless otherwise specified): reject: approval: - - code-review: [-1, -2] + - Code-Review: [-1, -2] **dequeue-on-new-patchset** Normally, if a new patchset is uploaded to a change that is in a diff --git a/etc/layout.yaml-sample b/etc/layout.yaml-sample index 53f6ba19ad..b84be11620 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$ diff --git a/tests/base.py b/tests/base.py index ea7559cc62..fbbe717994 100755 --- a/tests/base.py +++ b/tests/base.py @@ -133,9 +133,19 @@ class GerritChangeReference(git.Reference): class FakeGerritChange(object): - categories = {'approved': ('Approved', -1, 1), - 'code-review': ('Code-Review', -2, 2), - 'verified': ('Verified', -2, 2)} + categories = {'Approved': ('Approved', -1, 1), + 'Code-Review': ('Code-Review', -2, 2), + 'Verified': ('Verified', -2, 2)} + + # TODO(tobiash): This is used as a translation layer between the tests + # which use lower case labels. This can be removed if all + # tests are converted to use the correct casing. + categories_translation = {'approved': 'Approved', + 'code-review': 'Code-Review', + 'verified': 'Verified', + 'Approved': 'Approved', + 'Code-Review': 'Code-Review', + 'Verified': 'Verified'} def __init__(self, gerrit, number, project, branch, subject, status='NEW', upstream_root=None, files={}): @@ -331,8 +341,8 @@ class FakeGerritChange(object): if not granted_on: granted_on = time.time() approval = { - 'description': self.categories[category][0], - 'type': category, + 'description': self.categories_translation[category], + 'type': self.categories_translation[category], 'value': str(value), 'by': { 'username': username, @@ -341,7 +351,8 @@ class FakeGerritChange(object): 'grantedOn': int(granted_on) } for i, x in enumerate(self.patchsets[-1]['approvals'][:]): - if x['by']['username'] == username and x['type'] == category: + if x['by']['username'] == username and \ + x['type'] == self.categories_translation[category]: del self.patchsets[-1]['approvals'][i] self.patchsets[-1]['approvals'].append(approval) event = {'approvals': [approval], diff --git a/tests/fixtures/config/ansible/git/common-config/zuul.yaml b/tests/fixtures/config/ansible/git/common-config/zuul.yaml index 1a1b22f364..7e25a23f12 100644 --- a/tests/fixtures/config/ansible/git/common-config/zuul.yaml +++ b/tests/fixtures/config/ansible/git/common-config/zuul.yaml @@ -7,10 +7,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -20,17 +20,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - secret: diff --git a/tests/fixtures/config/broken/git/common-config/zuul.yaml b/tests/fixtures/config/broken/git/common-config/zuul.yaml index 162a9825cc..91b1b2d88d 100644 --- a/tests/fixtures/config/broken/git/common-config/zuul.yaml +++ b/tests/fixtures/config/broken/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - project: error: true diff --git a/tests/fixtures/config/data-return/git/common-config/zuul.yaml b/tests/fixtures/config/data-return/git/common-config/zuul.yaml index 8d602f1c8b..38107e5134 100644 --- a/tests/fixtures/config/data-return/git/common-config/zuul.yaml +++ b/tests/fixtures/config/data-return/git/common-config/zuul.yaml @@ -7,10 +7,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: data-return diff --git a/tests/fixtures/config/dependency-graph/git/common-config/zuul.yaml b/tests/fixtures/config/dependency-graph/git/common-config/zuul.yaml index cdf989e626..975d04e87d 100644 --- a/tests/fixtures/config/dependency-graph/git/common-config/zuul.yaml +++ b/tests/fixtures/config/dependency-graph/git/common-config/zuul.yaml @@ -6,17 +6,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml b/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml index 60d7363ee2..dabe58ce0a 100755 --- a/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml +++ b/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml @@ -7,10 +7,10 @@ - event: change-restored success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: dup2 @@ -21,10 +21,10 @@ - event: change-restored success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-test1 diff --git a/tests/fixtures/config/git-driver/git/common-config/zuul.yaml b/tests/fixtures/config/git-driver/git/common-config/zuul.yaml index 8fe8749781..128bbb502a 100644 --- a/tests/fixtures/config/git-driver/git/common-config/zuul.yaml +++ b/tests/fixtures/config/git-driver/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-test1 diff --git a/tests/fixtures/config/implicit-roles/git/common-config/zuul.yaml b/tests/fixtures/config/implicit-roles/git/common-config/zuul.yaml index ba91fb5557..5b2636f68c 100644 --- a/tests/fixtures/config/implicit-roles/git/common-config/zuul.yaml +++ b/tests/fixtures/config/implicit-roles/git/common-config/zuul.yaml @@ -6,7 +6,7 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 diff --git a/tests/fixtures/config/in-repo/git/common-config/zuul.yaml b/tests/fixtures/config/in-repo/git/common-config/zuul.yaml index fce086e4ab..d4ffad6ab1 100644 --- a/tests/fixtures/config/in-repo/git/common-config/zuul.yaml +++ b/tests/fixtures/config/in-repo/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: tenant-one-gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - pipeline: @@ -39,17 +39,17 @@ gerrit: - event: comment-added approval: - - code-review: 2 + - Code-Review: 2 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/config/inventory/git/common-config/zuul.yaml b/tests/fixtures/config/inventory/git/common-config/zuul.yaml index e147b9875c..177633d620 100644 --- a/tests/fixtures/config/inventory/git/common-config/zuul.yaml +++ b/tests/fixtures/config/inventory/git/common-config/zuul.yaml @@ -7,10 +7,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - nodeset: name: nodeset1 diff --git a/tests/fixtures/config/merges/git/common-config/zuul.yaml b/tests/fixtures/config/merges/git/common-config/zuul.yaml index 1309b3fd11..7ae2ef0df1 100644 --- a/tests/fixtures/config/merges/git/common-config/zuul.yaml +++ b/tests/fixtures/config/merges/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/config/multi-tenant-semaphore/git/common-config/zuul.yaml b/tests/fixtures/config/multi-tenant-semaphore/git/common-config/zuul.yaml index ba91fb5557..5b2636f68c 100644 --- a/tests/fixtures/config/multi-tenant-semaphore/git/common-config/zuul.yaml +++ b/tests/fixtures/config/multi-tenant-semaphore/git/common-config/zuul.yaml @@ -6,7 +6,7 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 diff --git a/tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml b/tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml index 362434e4f0..8e29d3bf89 100644 --- a/tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml +++ b/tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: python27 diff --git a/tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml b/tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml index 347bc53c56..9a1b9283a7 100644 --- a/tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml +++ b/tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml @@ -6,17 +6,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - nodeset: diff --git a/tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml b/tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml index 5ea803e582..9496a4978d 100644 --- a/tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml +++ b/tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml @@ -6,17 +6,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - nodeset: diff --git a/tests/fixtures/config/openstack/git/project-config/zuul.yaml b/tests/fixtures/config/openstack/git/project-config/zuul.yaml index 2ad600ceee..b3a8b0cb07 100644 --- a/tests/fixtures/config/openstack/git/project-config/zuul.yaml +++ b/tests/fixtures/config/openstack/git/project-config/zuul.yaml @@ -7,10 +7,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -20,17 +20,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml b/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml index 3de0d6d279..cfece30a9c 100644 --- a/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml +++ b/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml @@ -7,10 +7,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: python27 diff --git a/tests/fixtures/config/requirements/email/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/email/git/common-config/zuul.yaml index efc3b3230f..1626168c87 100644 --- a/tests/fixtures/config/requirements/email/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/email/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 require: gerrit: approval: @@ -25,10 +25,10 @@ - email: jenkins@example.com success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/requirements/newer-than/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/newer-than/git/common-config/zuul.yaml index 6f0601d491..2980ef131a 100644 --- a/tests/fixtures/config/requirements/newer-than/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/newer-than/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 require: gerrit: approval: @@ -27,10 +27,10 @@ newer-than: 48h success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/requirements/older-than/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/older-than/git/common-config/zuul.yaml index 77ee388090..9e2f5d7f34 100644 --- a/tests/fixtures/config/requirements/older-than/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/older-than/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 require: gerrit: approval: @@ -27,10 +27,10 @@ older-than: 48h success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/requirements/reject-username/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/reject-username/git/common-config/zuul.yaml index 9e9d000dcc..333a4c779b 100644 --- a/tests/fixtures/config/requirements/reject-username/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/reject-username/git/common-config/zuul.yaml @@ -10,10 +10,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: trigger @@ -25,10 +25,10 @@ - username: jenkins success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/requirements/reject/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/reject/git/common-config/zuul.yaml index b08a10558d..9aef0c5022 100644 --- a/tests/fixtures/config/requirements/reject/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/reject/git/common-config/zuul.yaml @@ -5,13 +5,13 @@ gerrit: approval: - username: jenkins - verified: + Verified: - 1 - 2 reject: gerrit: approval: - - verified: + - Verified: - -1 - -2 trigger: @@ -19,10 +19,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: trigger @@ -32,19 +32,19 @@ - event: comment-added require-approval: - username: jenkins - verified: + Verified: - 1 - 2 reject-approval: - - verified: + - Verified: - -1 - -2 success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/requirements/state/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/state/git/common-config/zuul.yaml index bd9dc8f737..081b655702 100644 --- a/tests/fixtures/config/requirements/state/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/state/git/common-config/zuul.yaml @@ -10,10 +10,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: open-check @@ -27,10 +27,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: status-check @@ -44,10 +44,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-job diff --git a/tests/fixtures/config/requirements/username/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/username/git/common-config/zuul.yaml index 455d9de9a9..d5f3553432 100644 --- a/tests/fixtures/config/requirements/username/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/username/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 require: gerrit: approval: @@ -25,10 +25,10 @@ - username: jenkins success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/requirements/vote1/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/vote1/git/common-config/zuul.yaml index 799282d86c..787cf0de08 100644 --- a/tests/fixtures/config/requirements/vote1/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/vote1/git/common-config/zuul.yaml @@ -5,16 +5,16 @@ gerrit: approval: - username: jenkins - verified: 1 + Verified: 1 trigger: gerrit: - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: trigger @@ -24,13 +24,13 @@ - event: comment-added require-approval: - username: jenkins - verified: 1 + Verified: 1 success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/requirements/vote2/git/common-config/zuul.yaml b/tests/fixtures/config/requirements/vote2/git/common-config/zuul.yaml index f3373714b1..b91a2160d9 100644 --- a/tests/fixtures/config/requirements/vote2/git/common-config/zuul.yaml +++ b/tests/fixtures/config/requirements/vote2/git/common-config/zuul.yaml @@ -5,7 +5,7 @@ gerrit: approval: - username: jenkins - verified: + Verified: - 1 - 2 trigger: @@ -13,10 +13,10 @@ - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: trigger @@ -26,15 +26,15 @@ - event: comment-added require-approval: - username: jenkins - verified: + Verified: - 1 - 2 success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-job diff --git a/tests/fixtures/config/roles/git/common-config/zuul.yaml b/tests/fixtures/config/roles/git/common-config/zuul.yaml index 1fdaf2ede8..a1b6e42f87 100644 --- a/tests/fixtures/config/roles/git/common-config/zuul.yaml +++ b/tests/fixtures/config/roles/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: tenant-one-gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/config/semaphore/git/common-config/zuul.yaml b/tests/fixtures/config/semaphore/git/common-config/zuul.yaml index 9d1cacf03c..5eeee21763 100644 --- a/tests/fixtures/config/semaphore/git/common-config/zuul.yaml +++ b/tests/fixtures/config/semaphore/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 # TODOv3(jeblair, tobiash): make semaphore definitions required, which # will cause these tests to fail until we define test-semaphore diff --git a/tests/fixtures/config/semaphore/zuul-reconfiguration.yaml b/tests/fixtures/config/semaphore/zuul-reconfiguration.yaml index 8fe8749781..128bbb502a 100644 --- a/tests/fixtures/config/semaphore/zuul-reconfiguration.yaml +++ b/tests/fixtures/config/semaphore/zuul-reconfiguration.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-test1 diff --git a/tests/fixtures/config/shadow/git/local-config/zuul.yaml b/tests/fixtures/config/shadow/git/local-config/zuul.yaml index 756e8438f9..dc2133f0a4 100644 --- a/tests/fixtures/config/shadow/git/local-config/zuul.yaml +++ b/tests/fixtures/config/shadow/git/local-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: base diff --git a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml index 27454d3d68..b768a83048 100644 --- a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml +++ b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - pipeline: diff --git a/tests/fixtures/config/split-config/git/common-config/zuul.d/pipelines.yaml b/tests/fixtures/config/split-config/git/common-config/zuul.d/pipelines.yaml index ba91fb5557..5b2636f68c 100644 --- a/tests/fixtures/config/split-config/git/common-config/zuul.d/pipelines.yaml +++ b/tests/fixtures/config/split-config/git/common-config/zuul.d/pipelines.yaml @@ -6,7 +6,7 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 diff --git a/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml b/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml index dd80d08093..0cb1d04ee8 100644 --- a/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml +++ b/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml @@ -6,12 +6,12 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 resultsdb: score: 1 failure: gerrit: - verified: -1 + Verified: -1 resultsdb: score: -1 resultsdb_failures: diff --git a/tests/fixtures/config/streamer/git/common-config/zuul.yaml b/tests/fixtures/config/streamer/git/common-config/zuul.yaml index 6f4fa7e5a3..5a653b4c1d 100644 --- a/tests/fixtures/config/streamer/git/common-config/zuul.yaml +++ b/tests/fixtures/config/streamer/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: python27 diff --git a/tests/fixtures/config/success-url/git/common-config/zuul.yaml b/tests/fixtures/config/success-url/git/common-config/zuul.yaml index 7082b8c266..6fbad0ddd8 100644 --- a/tests/fixtures/config/success-url/git/common-config/zuul.yaml +++ b/tests/fixtures/config/success-url/git/common-config/zuul.yaml @@ -9,12 +9,12 @@ to: alternative_me@example.com success: gerrit: - verified: 1 + Verified: 1 smtp: to: alternative_me@example.com failure: gerrit: - verified: -1 + Verified: -1 - job: name: docs-draft-test diff --git a/tests/fixtures/config/templated-project/git/common-config/zuul.d/pipelines.yaml b/tests/fixtures/config/templated-project/git/common-config/zuul.d/pipelines.yaml index 4a19796291..3f01e8a410 100644 --- a/tests/fixtures/config/templated-project/git/common-config/zuul.d/pipelines.yaml +++ b/tests/fixtures/config/templated-project/git/common-config/zuul.d/pipelines.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - pipeline: diff --git a/tests/fixtures/config/tenant-parser/git/common-config/zuul.yaml b/tests/fixtures/config/tenant-parser/git/common-config/zuul.yaml index 9e521872c0..ec371e837d 100644 --- a/tests/fixtures/config/tenant-parser/git/common-config/zuul.yaml +++ b/tests/fixtures/config/tenant-parser/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: common-config-job diff --git a/tests/fixtures/config/zuul-connections-multiple-gerrits/git/common-config/zuul.yaml b/tests/fixtures/config/zuul-connections-multiple-gerrits/git/common-config/zuul.yaml index 8f858cd022..87182b0b41 100644 --- a/tests/fixtures/config/zuul-connections-multiple-gerrits/git/common-config/zuul.yaml +++ b/tests/fixtures/config/zuul-connections-multiple-gerrits/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: review_gerrit: - verified: 1 + Verified: 1 failure: review_gerrit: - verified: -1 + Verified: -1 - pipeline: name: another_check @@ -19,10 +19,10 @@ - event: patchset-created success: another_gerrit: - verified: 1 + Verified: 1 failure: another_gerrit: - verified: -1 + Verified: -1 - pipeline: name: common_check @@ -34,14 +34,14 @@ - event: patchset-created success: review_gerrit: - verified: 1 + Verified: 1 another_gerrit: - verified: 1 + Verified: 1 failure: review_gerrit: - verified: -1 + Verified: -1 another_gerrit: - verified: -1 + Verified: -1 - job: name: project-test1 diff --git a/tests/fixtures/config/zuul-connections-same-gerrit/git/common-config/zuul.yaml b/tests/fixtures/config/zuul-connections-same-gerrit/git/common-config/zuul.yaml index adc61a38e7..e16bb80e43 100644 --- a/tests/fixtures/config/zuul-connections-same-gerrit/git/common-config/zuul.yaml +++ b/tests/fixtures/config/zuul-connections-same-gerrit/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: review_gerrit: - verified: 1 + Verified: 1 failure: alt_voting_gerrit: - verified: -1 + Verified: -1 - job: name: project-test1 diff --git a/tests/fixtures/config/zuultrigger/parent-change-enqueued/git/common-config/zuul.yaml b/tests/fixtures/config/zuultrigger/parent-change-enqueued/git/common-config/zuul.yaml index 351092c5f3..aae8b8d019 100644 --- a/tests/fixtures/config/zuultrigger/parent-change-enqueued/git/common-config/zuul.yaml +++ b/tests/fixtures/config/zuultrigger/parent-change-enqueued/git/common-config/zuul.yaml @@ -4,7 +4,7 @@ require: gerrit: approval: - - verified: -1 + - Verified: -1 trigger: gerrit: - event: patchset-created @@ -13,10 +13,10 @@ pipeline: gate success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -24,25 +24,25 @@ require: gerrit: approval: - - verified: 1 + - Verified: 1 trigger: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 zuul: - event: parent-change-enqueued pipeline: gate success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml b/tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml index 48fdffec1e..f0f3584415 100644 --- a/tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml +++ b/tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - pipeline: @@ -41,7 +41,7 @@ - event: project-change-merged merge-failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-check diff --git a/tests/fixtures/layout-cloner.yaml b/tests/fixtures/layout-cloner.yaml index e8b5dde08f..0d5112928e 100644 --- a/tests/fixtures/layout-cloner.yaml +++ b/tests/fixtures/layout-cloner.yaml @@ -6,10 +6,10 @@ pipelines: - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: gate manager: DependentPipelineManager @@ -18,17 +18,17 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 start: gerrit: - verified: 0 + Verified: 0 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 - name: post manager: IndependentPipelineManager diff --git a/tests/fixtures/layout-delayed-repo-init.yaml b/tests/fixtures/layout-delayed-repo-init.yaml index 6caf6222a2..04dc010ae9 100644 --- a/tests/fixtures/layout-delayed-repo-init.yaml +++ b/tests/fixtures/layout-delayed-repo-init.yaml @@ -6,10 +6,10 @@ pipelines: - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: post manager: IndependentPipelineManager @@ -25,17 +25,17 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high projects: diff --git a/tests/fixtures/layout-disable-at.yaml b/tests/fixtures/layout-disable-at.yaml index a2b2526af5..0ec8257693 100644 --- a/tests/fixtures/layout-disable-at.yaml +++ b/tests/fixtures/layout-disable-at.yaml @@ -6,10 +6,10 @@ pipelines: - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 disabled: smtp: to: you@example.com diff --git a/tests/fixtures/layout-live-reconfiguration-functions.yaml b/tests/fixtures/layout-live-reconfiguration-functions.yaml index b22b3abd2a..ef2186ea54 100644 --- a/tests/fixtures/layout-live-reconfiguration-functions.yaml +++ b/tests/fixtures/layout-live-reconfiguration-functions.yaml @@ -9,17 +9,17 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high jobs: diff --git a/tests/fixtures/layout-merge-queues.yaml b/tests/fixtures/layout-merge-queues.yaml index be39a1c464..b328341c4d 100644 --- a/tests/fixtures/layout-merge-queues.yaml +++ b/tests/fixtures/layout-merge-queues.yaml @@ -6,7 +6,7 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 projects: - name: projectA diff --git a/tests/fixtures/layout-requirement-vote.yaml b/tests/fixtures/layout-requirement-vote.yaml index 7ccadffa68..01aa97de80 100644 --- a/tests/fixtures/layout-requirement-vote.yaml +++ b/tests/fixtures/layout-requirement-vote.yaml @@ -4,16 +4,16 @@ pipelines: require: approval: - username: jenkins - verified: 1 + Verified: 1 trigger: gerrit: - event: comment-added success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: trigger manager: IndependentPipelineManager @@ -22,13 +22,13 @@ pipelines: - event: comment-added require-approval: - username: jenkins - verified: 1 + Verified: 1 success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 projects: - name: org/project1 diff --git a/tests/fixtures/layout-smtp.yaml b/tests/fixtures/layout-smtp.yaml index 813857b220..4306443c6e 100644 --- a/tests/fixtures/layout-smtp.yaml +++ b/tests/fixtures/layout-smtp.yaml @@ -9,13 +9,13 @@ pipelines: to: you@example.com success: gerrit: - verified: 1 + Verified: 1 smtp: to: alternative_me@example.com from: zuul_from@example.com failure: gerrit: - verified: -1 + Verified: -1 projects: - name: org/project diff --git a/tests/fixtures/layout.yaml b/tests/fixtures/layout.yaml index 6131de08ef..cd8ce19064 100644 --- a/tests/fixtures/layout.yaml +++ b/tests/fixtures/layout.yaml @@ -11,10 +11,10 @@ pipelines: - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: post manager: independent @@ -34,17 +34,17 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - name: unused @@ -56,7 +56,7 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 - name: dup1 manager: independent @@ -67,10 +67,10 @@ pipelines: - event: change-restored success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: dup2 manager: independent @@ -81,10 +81,10 @@ pipelines: - event: change-restored success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - name: conflict manager: dependent @@ -95,17 +95,17 @@ pipelines: gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 - name: experimental manager: independent diff --git a/tests/fixtures/layouts/disable_at.yaml b/tests/fixtures/layouts/disable_at.yaml index 8e352d8052..09082a425a 100644 --- a/tests/fixtures/layouts/disable_at.yaml +++ b/tests/fixtures/layouts/disable_at.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 disabled: smtp: to: you@example.com diff --git a/tests/fixtures/layouts/footer-message.yaml b/tests/fixtures/layouts/footer-message.yaml index 126190225c..e5003716f0 100644 --- a/tests/fixtures/layouts/footer-message.yaml +++ b/tests/fixtures/layouts/footer-message.yaml @@ -8,21 +8,21 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: smtp: to: you@example.com gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 smtp: to: you@example.com start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/ignore-dependencies.yaml b/tests/fixtures/layouts/ignore-dependencies.yaml index 86fe67443c..9eab9f4045 100644 --- a/tests/fixtures/layouts/ignore-dependencies.yaml +++ b/tests/fixtures/layouts/ignore-dependencies.yaml @@ -7,10 +7,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project1-merge diff --git a/tests/fixtures/layouts/inheritance.yaml b/tests/fixtures/layouts/inheritance.yaml index 65dddab877..146ca4dea1 100644 --- a/tests/fixtures/layouts/inheritance.yaml +++ b/tests/fixtures/layouts/inheritance.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-test-irrelevant-starts-empty diff --git a/tests/fixtures/layouts/irrelevant-files.yaml b/tests/fixtures/layouts/irrelevant-files.yaml index 3d086dc4ee..fbcca8f7fe 100644 --- a/tests/fixtures/layouts/irrelevant-files.yaml +++ b/tests/fixtures/layouts/irrelevant-files.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-test-irrelevant-files diff --git a/tests/fixtures/layouts/live-reconfiguration-add-job.yaml b/tests/fixtures/layouts/live-reconfiguration-add-job.yaml index 59162821c6..1616dcbc91 100644 --- a/tests/fixtures/layouts/live-reconfiguration-add-job.yaml +++ b/tests/fixtures/layouts/live-reconfiguration-add-job.yaml @@ -6,17 +6,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/live-reconfiguration-del-project.yaml b/tests/fixtures/layouts/live-reconfiguration-del-project.yaml index 299c6122ec..1eada5ce59 100644 --- a/tests/fixtures/layouts/live-reconfiguration-del-project.yaml +++ b/tests/fixtures/layouts/live-reconfiguration-del-project.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-merge diff --git a/tests/fixtures/layouts/live-reconfiguration-failed-job.yaml b/tests/fixtures/layouts/live-reconfiguration-failed-job.yaml index 0907880ba5..2b97419621 100644 --- a/tests/fixtures/layouts/live-reconfiguration-failed-job.yaml +++ b/tests/fixtures/layouts/live-reconfiguration-failed-job.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-merge diff --git a/tests/fixtures/layouts/live-reconfiguration-shared-queue.yaml b/tests/fixtures/layouts/live-reconfiguration-shared-queue.yaml index bf4416ada4..3cbed68def 100644 --- a/tests/fixtures/layouts/live-reconfiguration-shared-queue.yaml +++ b/tests/fixtures/layouts/live-reconfiguration-shared-queue.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/merge-failure.yaml b/tests/fixtures/layouts/merge-failure.yaml index 228963f516..cc683a975b 100644 --- a/tests/fixtures/layouts/merge-failure.yaml +++ b/tests/fixtures/layouts/merge-failure.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: post @@ -28,22 +28,22 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 merge-failure: gerrit: - verified: -1 + Verified: -1 smtp: to: you@example.com start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/no-jobs-project.yaml b/tests/fixtures/layouts/no-jobs-project.yaml index 803e5a025d..593a8d7b8b 100644 --- a/tests/fixtures/layouts/no-jobs-project.yaml +++ b/tests/fixtures/layouts/no-jobs-project.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: project-testfile diff --git a/tests/fixtures/layouts/no-jobs.yaml b/tests/fixtures/layouts/no-jobs.yaml index 66193b0c7d..facae0a40a 100644 --- a/tests/fixtures/layouts/no-jobs.yaml +++ b/tests/fixtures/layouts/no-jobs.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/no-timer.yaml b/tests/fixtures/layouts/no-timer.yaml index 05f17d2589..fda7b8b6ca 100644 --- a/tests/fixtures/layouts/no-timer.yaml +++ b/tests/fixtures/layouts/no-timer.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: periodic diff --git a/tests/fixtures/layouts/nonvoting-job.yaml b/tests/fixtures/layouts/nonvoting-job.yaml index fee5043460..c536e1156b 100644 --- a/tests/fixtures/layouts/nonvoting-job.yaml +++ b/tests/fixtures/layouts/nonvoting-job.yaml @@ -6,17 +6,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/noop-job.yaml b/tests/fixtures/layouts/noop-job.yaml index 8081216c16..3d1b20f424 100644 --- a/tests/fixtures/layouts/noop-job.yaml +++ b/tests/fixtures/layouts/noop-job.yaml @@ -6,17 +6,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - project: diff --git a/tests/fixtures/layouts/one-job-project.yaml b/tests/fixtures/layouts/one-job-project.yaml index b29326901c..db117b1b09 100644 --- a/tests/fixtures/layouts/one-job-project.yaml +++ b/tests/fixtures/layouts/one-job-project.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - pipeline: diff --git a/tests/fixtures/layouts/rate-limit.yaml b/tests/fixtures/layouts/rate-limit.yaml index 283354e07f..9392f5e0a5 100644 --- a/tests/fixtures/layouts/rate-limit.yaml +++ b/tests/fixtures/layouts/rate-limit.yaml @@ -6,17 +6,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 start: gerrit: - verified: 0 + Verified: 0 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 window: 2 window-floor: 1 window-increase-type: linear diff --git a/tests/fixtures/layouts/repo-checkout-four-project.yaml b/tests/fixtures/layouts/repo-checkout-four-project.yaml index 392931ac3b..36937e986c 100644 --- a/tests/fixtures/layouts/repo-checkout-four-project.yaml +++ b/tests/fixtures/layouts/repo-checkout-four-project.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/repo-checkout-six-project.yaml b/tests/fixtures/layouts/repo-checkout-six-project.yaml index 93a64ea633..c0de47d0bc 100644 --- a/tests/fixtures/layouts/repo-checkout-six-project.yaml +++ b/tests/fixtures/layouts/repo-checkout-six-project.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/repo-checkout-two-project.yaml b/tests/fixtures/layouts/repo-checkout-two-project.yaml index 239d80c68f..e25554b445 100644 --- a/tests/fixtures/layouts/repo-checkout-two-project.yaml +++ b/tests/fixtures/layouts/repo-checkout-two-project.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/repo-deleted.yaml b/tests/fixtures/layouts/repo-deleted.yaml index 95d11bbdd6..cea3ddac44 100644 --- a/tests/fixtures/layouts/repo-deleted.yaml +++ b/tests/fixtures/layouts/repo-deleted.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/smtp.yaml b/tests/fixtures/layouts/smtp.yaml index fd91d36d6b..bf1d273dec 100644 --- a/tests/fixtures/layouts/smtp.yaml +++ b/tests/fixtures/layouts/smtp.yaml @@ -9,13 +9,13 @@ to: you@example.com success: gerrit: - verified: 1 + Verified: 1 smtp: to: alternative_me@example.com from: zuul_from@example.com failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -25,17 +25,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/tags.yaml b/tests/fixtures/layouts/tags.yaml index 422eca253f..646160e2f8 100644 --- a/tests/fixtures/layouts/tags.yaml +++ b/tests/fixtures/layouts/tags.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - job: name: merge diff --git a/tests/fixtures/layouts/three-projects.yaml b/tests/fixtures/layouts/three-projects.yaml index 5d102769ed..6481fb9104 100644 --- a/tests/fixtures/layouts/three-projects.yaml +++ b/tests/fixtures/layouts/three-projects.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: gate @@ -19,17 +19,17 @@ gerrit: - event: comment-added approval: - - approved: 1 + - Approved: 1 success: gerrit: - verified: 2 + Verified: 2 submit: true failure: gerrit: - verified: -2 + Verified: -2 start: gerrit: - verified: 0 + Verified: 0 precedence: high - job: diff --git a/tests/fixtures/layouts/timer.yaml b/tests/fixtures/layouts/timer.yaml index dbce51637d..45f137cd68 100644 --- a/tests/fixtures/layouts/timer.yaml +++ b/tests/fixtures/layouts/timer.yaml @@ -6,10 +6,10 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 - pipeline: name: periodic diff --git a/tests/fixtures/layouts/unmanaged-project.yaml b/tests/fixtures/layouts/unmanaged-project.yaml index d72c26e4ba..4c4305e534 100644 --- a/tests/fixtures/layouts/unmanaged-project.yaml +++ b/tests/fixtures/layouts/unmanaged-project.yaml @@ -10,13 +10,13 @@ - event: patchset-created success: gerrit: - verified: 1 + Verified: 1 failure: gerrit: - verified: -1 + Verified: -1 start: gerrit: - verified: 0 + Verified: 0 - project: name: org/project1 diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py index c9e2e91bd7..77b13a591a 100644 --- a/tests/unit/test_connection.py +++ b/tests/unit/test_connection.py @@ -39,7 +39,7 @@ class TestConnections(ZuulTestCase): self.waitUntilSettled() self.assertEqual(len(A.patchsets[-1]['approvals']), 1) - self.assertEqual(A.patchsets[-1]['approvals'][0]['type'], 'verified') + self.assertEqual(A.patchsets[-1]['approvals'][0]['type'], 'Verified') self.assertEqual(A.patchsets[-1]['approvals'][0]['value'], '1') self.assertEqual(A.patchsets[-1]['approvals'][0]['by']['username'], 'jenkins') @@ -51,7 +51,7 @@ class TestConnections(ZuulTestCase): self.waitUntilSettled() self.assertEqual(len(B.patchsets[-1]['approvals']), 1) - self.assertEqual(B.patchsets[-1]['approvals'][0]['type'], 'verified') + self.assertEqual(B.patchsets[-1]['approvals'][0]['type'], 'Verified') self.assertEqual(B.patchsets[-1]['approvals'][0]['value'], '-1') self.assertEqual(B.patchsets[-1]['approvals'][0]['by']['username'], 'civoter') diff --git a/zuul/driver/gerrit/gerritconnection.py b/zuul/driver/gerrit/gerritconnection.py index 98adc69b53..63f30937dc 100644 --- a/zuul/driver/gerrit/gerritconnection.py +++ b/zuul/driver/gerrit/gerritconnection.py @@ -581,7 +581,7 @@ class GerritConnection(BaseConnection): continue elif label['status'] in ['NEED', 'REJECT']: # It may be our own rejection, so we ignore - if label['label'].lower() not in allow_needs: + if label['label'] not in allow_needs: return False continue else: diff --git a/zuul/driver/gerrit/gerritmodel.py b/zuul/driver/gerrit/gerritmodel.py index 818d260a45..f35c3e7159 100644 --- a/zuul/driver/gerrit/gerritmodel.py +++ b/zuul/driver/gerrit/gerritmodel.py @@ -24,11 +24,6 @@ from zuul.driver.util import time_to_seconds EMPTY_GIT_REF = '0' * 40 # git sha of all zeros, used during creates/deletes -def normalize_category(name): - name = name.lower() - return re.sub(' ', '-', name) - - class GerritChange(Change): def __init__(self, project): super(GerritChange, self).__init__(project) @@ -109,7 +104,7 @@ class GerritApprovalFilter(object): else: if not isinstance(v, list): v = [v] - if (normalize_category(approval['description']) != k or + if (approval['description'] != k or int(approval['value']) not in v): return False return True @@ -281,8 +276,8 @@ class GerritEventFilter(EventFilter, GerritApprovalFilter): for category, value in self.event_approvals.items(): matches_approval = False for eapp in event.approvals: - if (normalize_category(eapp['description']) == category and - int(eapp['value']) == int(value)): + if (eapp['description'] == category and + int(eapp['value']) == int(value)): matches_approval = True if not matches_approval: return False