diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-15 16:42:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-15 16:42:41 +0000 |
| commit | 4dc62c4dfa62e29a6e5f0f995079f7e211708691 (patch) | |
| tree | e3a495022c66fd599511104267387e53bccfaf88 /zuul/manager | |
| parent | 075ed824bd116f052ad1f04add3429e2748b8f66 (diff) | |
| parent | 2e8f2b61ab5ceb05e947a0ab536f9dcbaab6a2cb (diff) | |
| download | zuul-4dc62c4dfa62e29a6e5f0f995079f7e211708691.tar.gz | |
Merge "Annotate canMerge check with event id"
Diffstat (limited to 'zuul/manager')
| -rw-r--r-- | zuul/manager/__init__.py | 4 | ||||
| -rw-r--r-- | zuul/manager/dependent.py | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py index eee2b8dfb..a2daf6729 100644 --- a/zuul/manager/__init__.py +++ b/zuul/manager/__init__.py @@ -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 diff --git a/zuul/manager/dependent.py b/zuul/manager/dependent.py index ae65300da..2f47013cf 100644 --- a/zuul/manager/dependent.py +++ b/zuul/manager/dependent.py @@ -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 |