zuul/zuul
Code Issues Proposed changes

Merge "Annotate canMerge check with event id"

Browse Source
This commit is contained in:
Zuul
2019-07-15 16:42:41 +00:00
committed by Gerrit Code Review
parent 075ed824bd 2e8f2b61ab
commit 4dc62c4dfa
10 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zuul/manager/__init__.py
View File

@@ -179,7 +179,7 @@ class PipelineManager(object):
report_errors.append(str(e))
return report_errors
def isChangeReadyToBeEnqueued(self, change):
def isChangeReadyToBeEnqueued(self, change, event):
return True
def enqueueChangesAhead(self, change, event, quiet, ignore_requirements,
@@ -298,7 +298,7 @@ class PipelineManager(object):
change, f, str(match_result)))
return False
if not self.isChangeReadyToBeEnqueued(change):
if not self.isChangeReadyToBeEnqueued(change, event):
log.debug("Change %s is not ready to be enqueued, ignoring" %
change)
return False

8
zuul/manager/dependent.py
View File

@@ -97,10 +97,12 @@ class DependentPipelineManager(PipelineManager):
items = change_queue.queue
return items.index(item)
def isChangeReadyToBeEnqueued(self, change):
def isChangeReadyToBeEnqueued(self, change, event):
log = get_annotated_logger(self.log, event)
source = change.project.source
if not source.canMerge(change, self.getSubmitAllowNeeds()):
self.log.debug("Change %s can not merge, ignoring" % change)
if not source.canMerge(change, self.getSubmitAllowNeeds(),
event=event):
log.debug("Change %s can not merge, ignoring", change)
return False
return True