jenkins-bot has submitted this change and it was merged.
Change subject: zuul: revert label back to all lower case
......................................................................
zuul: revert label back to all lower case
Revert "Workaround Zuul normalizing approval fields"
This reverts commit 369e6eb9f3ab57d5ae574dda0113511e970e24b6.
Revert "zuul: fix Gerrit labels"
This reverts commit 4e31d4a94297a49146fc186a9c4c8b6b6f9f47ac.
Require Zuul package 2.0.0-327-g3ebedde-wmf3precise1 which revert an
upstream patches that changed the way labels are passed to the gerrit
review command.
Bug: T106531
Change-Id: Ida64dd26c1e7f1f8254f00451c14263072bc69b7
---
M tests/test_zuul_layout.py
M zuul/layout.yaml
2 files changed, 13 insertions(+), 31 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index 8bb69f4..f45cc72 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -405,23 +405,6 @@
manager.pipeline.name)
for manager in managers]
- # Make sure Code-Review +2 approval is recognized by gate-and-submit
- # The EventFilter does some normalization (T106436)
- def test_code_review_2_matched_by_gate_and_submit(self):
- gate = self.getPipeline('gate-and-submit').manager
- change = zuul.model.Change('mediawiki/core')
-
- event = zuul.model.TriggerEvent()
- event.type = 'comment-added'
- event.account = {'email': '[email protected]'}
- event.approvals = [{'type': 'Code-Review',
- 'description': 'Code-Review',
- 'value': '2',
- 'by': {'email': '[email protected]'},
- }]
-
- self.assertTrue(gate.eventMatches(event, change))
-
# Currently failing since we're ignoring l10n-bot until we can fix
# issues with CI being overloaded (T91707)
@unittest.expectedFailure
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a3be20e..964d03b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -173,11 +173,11 @@
# Only V+1 as these are not elaborate tests. This prevents a change from
# being merged (requires V+2) before elaborate tests, which vote V+2,
have run.
gerrit:
- Verified: 1
+ verified: 1
failure-message: 'Basic test build failed.'
failure:
gerrit:
- Verified: -1
+ verified: -1
# Use this instead of 'check' for projects not having a separate 'test'
pipeline. Those need to
# be marked as 'check-only' instead of 'check', because 'check' has a
reversed email filter to
@@ -195,11 +195,11 @@
success-message: 'Basic test build succeeded.'
success:
gerrit:
- Verified: 1
+ verified: 1
failure-message: 'Basic test build failed.'
failure:
gerrit:
- Verified: -1
+ verified: -1
- name: check-voter
description: >
@@ -215,11 +215,11 @@
success-message: 'Basic test build succeeded.'
success:
gerrit:
- Verified: 2
+ verified: 2
failure-message: 'Basic test build failed.'
failure:
gerrit:
- Verified: -1
+ verified: -1
# Use this in combination with a check pipeline.
- name: test
@@ -389,11 +389,11 @@
success-message: 'Main test build succeeded.'
success:
gerrit:
- Verified: 2
+ verified: 2
failure-message: 'Main test build failed.'
failure:
gerrit:
- Verified: -1
+ verified: -1
- name: experimental
description: >
@@ -446,21 +446,20 @@
email:
- ^(?!l10n-bot@translatewiki\.net).*$
approval:
- # Zuul EventFilter normalizes approvals to lower case T106436
- code-review: 2
start:
gerrit:
- Verified: 0
+ verified: 0
success-message: 'Gate pipeline build succeeded.'
success:
gerrit:
- Verified: 2
+ verified: 2
# Let Zuul merge the change \O/
submit: true
failure-message: 'Gate pipeline build failed.'
failure:
gerrit:
- Verified: -1
+ verified: -1
- name: postmerge
description: Jobs triggered after a change has been merged.
@@ -473,11 +472,11 @@
# Since Gerrit 2.8, we can vote on closed changes.
success:
gerrit:
- Verified: 0
+ verified: 0
failure-message: 'Post-merge build failed.'
failure:
gerrit:
- Verified: 0
+ verified: 0
# Pipeline reacting whenever a reference is updated
- name: post
--
To view, visit https://gerrit.wikimedia.org/r/226679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida64dd26c1e7f1f8254f00451c14263072bc69b7
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
