Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/226532
Change subject: Fix gerrit review case mismatch errors with labels ...................................................................... Fix gerrit review case mismatch errors with labels Revert upstream patch that makes Zuul to send code-review and verified label votes using the shortcuts --verified and --code-review since --label is case sensitive. Bug: T106531 Bug: T106596 Change-Id: I22325b2eb2c7226e8a92863877bacc79631e78b4 --- M debian/changelog A debian/patches/0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch M debian/patches/series 3 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul refs/changes/32/226532/1 diff --git a/debian/changelog b/debian/changelog index b61c118..9a50d0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +zuul (2.0.0-327-g3ebedde-wmf3precise1) precise-wikimedia; urgency=medium + + * 0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no + Makes Zuul to send code-review and verified label votes using the shortcuts + --verified and --code-review since --label is case sensitive. + See https://phabricator.wikimedia.org/T106596 + + -- Antoine Musso <[email protected]> Thu, 23 Jul 2015 14:11:53 +0000 + zuul (2.0.0-327-g3ebedde-wmf2precise1) precise-wikimedia; urgency=medium * 0007-Remove-lockfile-from-requirements.patch diff --git a/debian/patches/0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch b/debian/patches/0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch new file mode 100644 index 0000000..71348a5 --- /dev/null +++ b/debian/patches/0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch @@ -0,0 +1,37 @@ +From: Antoine Musso <[email protected]> +Date: Wed, 22 Jul 2015 23:01:16 +0200 +Subject: Revert "Fix passing labels to Gerrit when they are not defined in + All-Projects" + +That changed Zuul to send `gerrit review` with `--label verified=1` +which causes a SQL backend error on our side (T106596). It should be +upper case first `Verified` but setting that in the layout.yaml file +causes approval to no more matches cause they are made against a lower() +case version. + +Revert back to passing --code-review and --verified, that will let us +switch back our layout.yaml file back to all lower case which fits the +approval matching rules. + +This reverts commit c387a5043e9db2ec87699ea5fd2b08b40d12e882. + +Bug: T106531 +Bug: T106596 +Change-Id: I74fa0367605bf395df0380c81468c96f0b5b6e84 +--- + zuul/lib/gerrit.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zuul/lib/gerrit.py b/zuul/lib/gerrit.py +index 9aeff3d..5aad953 100644 +--- a/zuul/lib/gerrit.py ++++ b/zuul/lib/gerrit.py +@@ -120,7 +120,7 @@ class Gerrit(object): + if v is True: + cmd += ' --%s' % k + else: +- cmd += ' --label %s=%s' % (k, v) ++ cmd += ' --%s %s' % (k, v) + cmd += ' %s' % change + out, err = self._ssh(cmd) + return err diff --git a/debian/patches/series b/debian/patches/series index 6170fda..ed29ac4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 0005-Replace-python-shebang-with-python2.7.patch 0006-Cloner-Implement-cache-no-hardlinks-argument.patch 0007-Remove-lockfile-from-requirements.patch +0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch -- To view, visit https://gerrit.wikimedia.org/r/226532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22325b2eb2c7226e8a92863877bacc79631e78b4 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul Gerrit-Branch: debian/precise-wikimedia Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
