zuul
/
zuul
Code Issues Proposed changes

Merge "Offload repo reset during merge"

This commit is contained in:
Zuul 2020-09-14 18:59:44 +00:00 committed by Gerrit Code Review
parent 260abf8d48 fd52935b3d
commit 9dfeb874fc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zuul/merger/merger.py
View File

@ -903,7 +903,8 @@ class Merger(object):
# we need to reset here in order to call getBranchHead
log.debug("No base commit found for %s" % (key,))
try:
repo.reset(zuul_event_id=zuul_event_id)
repo.reset(zuul_event_id=zuul_event_id,
process_worker=process_worker)
except Exception:
log.exception("Unable to reset repo %s" % repo)
return None, None