zuul
/
zuul
Code Issues Proposed changes

Merge "Case sensitive label matching" into feature/zuulv3

This commit is contained in:
Jenkins 2017-07-27 17:05:45 +00:00 committed by Gerrit Code Review
parent 52382f7740 ea98a194cc
commit eab7ee2555
80 changed files with 347 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/user/config.rst
View File

@ -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

16
etc/layout.yaml-sample
View File

@ -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$

23
tests/base.py
View File

@ -134,9 +134,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={}):
@ -332,8 +342,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,
@ -342,7 +352,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],

12
tests/fixtures/config/ansible/git/common-config/zuul.yaml vendored
View File

@ -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:

4
tests/fixtures/config/broken/git/common-config/zuul.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- project:
error: true

4
tests/fixtures/config/data-return/git/common-config/zuul.yaml vendored
View File

@ -7,10 +7,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: data-return

8
tests/fixtures/config/dependency-graph/git/common-config/zuul.yaml vendored
View File

@ -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:

8
tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml vendored
View File

@ -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

4
tests/fixtures/config/git-driver/git/common-config/zuul.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: project-test1

4
tests/fixtures/config/implicit-roles/git/common-config/zuul.yaml vendored
View File

@ -6,7 +6,7 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1

20
tests/fixtures/config/in-repo/git/common-config/zuul.yaml vendored
View File

@ -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:

4
tests/fixtures/config/inventory/git/common-config/zuul.yaml vendored
View File

@ -7,10 +7,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- nodeset:
name: nodeset1

12
tests/fixtures/config/merges/git/common-config/zuul.yaml vendored
View File

@ -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:

4
tests/fixtures/config/multi-tenant-semaphore/git/common-config/zuul.yaml vendored
View File

@ -6,7 +6,7 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1

4
tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: python27

8
tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml vendored
View File

@ -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:

8
tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml vendored
View File

@ -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:

12
tests/fixtures/config/openstack/git/project-config/zuul.yaml vendored
View File

@ -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:

4
tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml vendored
View File

@ -7,10 +7,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: python27

8
tests/fixtures/config/requirements/email/git/common-config/zuul.yaml vendored
View File

@ -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

8
tests/fixtures/config/requirements/newer-than/git/common-config/zuul.yaml vendored
View File

@ -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

8
tests/fixtures/config/requirements/older-than/git/common-config/zuul.yaml vendored
View File

@ -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

8
tests/fixtures/config/requirements/reject-username/git/common-config/zuul.yaml vendored
View File

@ -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

16
tests/fixtures/config/requirements/reject/git/common-config/zuul.yaml vendored
View File

@ -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

12
tests/fixtures/config/requirements/state/git/common-config/zuul.yaml vendored
View File

@ -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

8
tests/fixtures/config/requirements/username/git/common-config/zuul.yaml vendored
View File

@ -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

12
tests/fixtures/config/requirements/vote1/git/common-config/zuul.yaml vendored
View File

@ -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

12
tests/fixtures/config/requirements/vote2/git/common-config/zuul.yaml vendored
View File

@ -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

12
tests/fixtures/config/roles/git/common-config/zuul.yaml vendored
View File

@ -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:

4
tests/fixtures/config/semaphore/git/common-config/zuul.yaml vendored
View File

@ -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

4
tests/fixtures/config/semaphore/zuul-reconfiguration.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: project-test1

4
tests/fixtures/config/shadow/git/local-config/zuul.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: base

12
tests/fixtures/config/single-tenant/git/common-config/zuul.yaml vendored
View File

@ -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:

4
tests/fixtures/config/split-config/git/common-config/zuul.d/pipelines.yaml vendored
View File

@ -6,7 +6,7 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1

4
tests/fixtures/config/sql-driver/git/common-config/zuul.yaml vendored
View File

@ -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:

4
tests/fixtures/config/streamer/git/common-config/zuul.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: python27

4
tests/fixtures/config/success-url/git/common-config/zuul.yaml vendored
View File

@ -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

12
tests/fixtures/config/templated-project/git/common-config/zuul.d/pipelines.yaml vendored
View File

@ -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:

4
tests/fixtures/config/tenant-parser/git/common-config/zuul.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: common-config-job

16
tests/fixtures/config/zuul-connections-multiple-gerrits/git/common-config/zuul.yaml vendored
View File

@ -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

4
tests/fixtures/config/zuul-connections-same-gerrit/git/common-config/zuul.yaml vendored
View File

@ -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

16
tests/fixtures/config/zuultrigger/parent-change-enqueued/git/common-config/zuul.yaml vendored
View File

@ -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:

14
tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml vendored
View File

@ -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

12
tests/fixtures/layout-cloner.yaml vendored
View File

@ -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

12
tests/fixtures/layout-delayed-repo-init.yaml vendored
View File

@ -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:

4
tests/fixtures/layout-disable-at.yaml vendored
View File

@ -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

8
tests/fixtures/layout-live-reconfiguration-functions.yaml vendored
View File

@ -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:

2
tests/fixtures/layout-merge-queues.yaml vendored
View File

@ -6,7 +6,7 @@ pipelines:
gerrit:
- event: comment-added
approval:
- approved: 1
- Approved: 1
projects:
- name: projectA

12
tests/fixtures/layout-requirement-vote.yaml vendored
View File

@ -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

4
tests/fixtures/layout-smtp.yaml vendored
View File

@ -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

30
tests/fixtures/layout.yaml vendored
View File

@ -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

4
tests/fixtures/layouts/disable_at.yaml vendored
View File

@ -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

8
tests/fixtures/layouts/footer-message.yaml vendored
View File

@ -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:

4
tests/fixtures/layouts/ignore-dependencies.yaml vendored
View File

@ -7,10 +7,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: project1-merge

4
tests/fixtures/layouts/inheritance.yaml vendored
View File

@ -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

4
tests/fixtures/layouts/irrelevant-files.yaml vendored
View File

@ -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

8
tests/fixtures/layouts/live-reconfiguration-add-job.yaml vendored
View File

@ -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:

4
tests/fixtures/layouts/live-reconfiguration-del-project.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: project-merge

4
tests/fixtures/layouts/live-reconfiguration-failed-job.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: project-merge

12
tests/fixtures/layouts/live-reconfiguration-shared-queue.yaml vendored
View File

@ -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:

14
tests/fixtures/layouts/merge-failure.yaml vendored
View File

@ -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:

4
tests/fixtures/layouts/no-jobs-project.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: project-testfile

12
tests/fixtures/layouts/no-jobs.yaml vendored
View File

@ -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:

4
tests/fixtures/layouts/no-timer.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- pipeline:
name: periodic

8
tests/fixtures/layouts/nonvoting-job.yaml vendored
View File

@ -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:

8
tests/fixtures/layouts/noop-job.yaml vendored
View File

@ -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:

12
tests/fixtures/layouts/one-job-project.yaml vendored
View File

@ -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:

8
tests/fixtures/layouts/rate-limit.yaml vendored
View File

@ -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

12
tests/fixtures/layouts/repo-checkout-four-project.yaml vendored
View File

@ -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:

12
tests/fixtures/layouts/repo-checkout-six-project.yaml vendored
View File

@ -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:

12
tests/fixtures/layouts/repo-checkout-two-project.yaml vendored
View File

@ -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:

12
tests/fixtures/layouts/repo-deleted.yaml vendored
View File

@ -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:

12
tests/fixtures/layouts/smtp.yaml vendored
View File

@ -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:

4
tests/fixtures/layouts/tags.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- job:
name: merge

12
tests/fixtures/layouts/three-projects.yaml vendored
View File

@ -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:

4
tests/fixtures/layouts/timer.yaml vendored
View File

@ -6,10 +6,10 @@
- event: patchset-created
success:
gerrit:
verified: 1
Verified: 1
failure:
gerrit:
verified: -1
Verified: -1
- pipeline:
name: periodic

6
tests/fixtures/layouts/unmanaged-project.yaml vendored
View File

@ -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

4
tests/unit/test_connection.py
View File

@ -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')

2
zuul/driver/gerrit/gerritconnection.py
View File

@ -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:

11
zuul/driver/gerrit/gerritmodel.py
View File

@ -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