summaryrefslogtreecommitdiff
path: root/zuul/driver/gerrit/gerritsource.py
diff options
context:
space:
mode:
authorTristan Cacqueray <tdecacqu@redhat.com>2018-06-21 13:07:18 +0000
committerTristan Cacqueray <tdecacqu@redhat.com>2018-06-21 23:00:38 +0000
commitdab1dde3fe4eee81db419969fce750456c12ee8f (patch)
tree57592cf9bf314fb136153a922f8ec3d9064c7d47 /zuul/driver/gerrit/gerritsource.py
parenta5c6c31043a413819e2d9a6afb39be7b999fb6e4 (diff)
downloadzuul-dab1dde3fe4eee81db419969fce750456c12ee8f.tar.gz
gerrit: cast change and patchset numbers to str
This is a follow-up to https://review.openstack.org/433748 where we need to cast all json access to change and patchset number as str. At least the refresh_deps logic relies on python eq check, and Zuul doesn't dequeue child changes when parent change get updated in Gerrit-2.14. Here is diagnostic DEBUG informations (2 depends-on 1, patchset 1,13 doesn't dequeue change 2): Change <Change 1,13> is a new version of <Change 1,12>, removing <QueueItem for <Change 1,12> in check> Canceling builds behind change: <Change 1,12> because it is being removed. Cancel jobs for change <Change 1,12> Removing change <Change 1,12> from queue [snip] Starting queue processor: check Checking for changes needed by <Change 2,5>: Change <Change 2,5> needs change <Change 1,12>: Needed change is already ahead in the queue Change-Id: Id73a479d155fa6d9b2c562869cae6c82dd065911
Diffstat (limited to 'zuul/driver/gerrit/gerritsource.py')
-rw-r--r--zuul/driver/gerrit/gerritsource.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/zuul/driver/gerrit/gerritsource.py b/zuul/driver/gerrit/gerritsource.py
index 5927a82b0..c37d74249 100644
--- a/zuul/driver/gerrit/gerritsource.py
+++ b/zuul/driver/gerrit/gerritsource.py
@@ -97,7 +97,8 @@ class GerritSource(BaseSource):
break
if not found:
continue
- key = (result['number'], result['currentPatchSet']['number'])
+ key = (str(result['number']),
+ str(result['currentPatchSet']['number']))
if key in seen:
continue
seen.add(key)