zuul
/
zuul
Code Issues Proposed changes

Merge "Keep consistent types on QueueItem ahead/behind attrs"

This commit is contained in:
Zuul 2021-11-03 07:03:59 +00:00 committed by Gerrit Code Review
parent 7c36f7274c 239f2c823e
commit 5cd7420745
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/model.py
View File

@ -838,8 +838,8 @@ class ChangeQueue(zkobject.ZKObject):
# The pipeline manager will take care of correcting the
# references on the next queue iteration.
item._set(
item_ahead=items_by_path.get(item.item_ahead),
items_behind=[items_by_path[p] for p in item.items_behind
item_ahead=items_by_path.get(item._item_ahead),
items_behind=[items_by_path[p] for p in item._items_behind
if p in items_by_path])
bundle_by_uuid = {}
@ -3925,6 +3925,8 @@ class QueueItem(zkobject.ZKObject):
"dynamic_state": defaultdict(dict, data["dynamic_state"]),
"current_build_set": build_set,
})
data['_item_ahead'] = data.pop('item_ahead')
data['_items_behind'] = data.pop('items_behind')
return data
def annotateLogger(self, logger):