summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-04 19:48:02 +0000
committerGerrit Code Review <review@openstack.org>2019-02-04 19:48:02 +0000
commite692bf530deee6d1fa8eb6c5b66579321903907c (patch)
tree651b74ff821fee6d6e2a93d7e272f6ac9b831c9b
parent66f9dc32c0ccf1cb0dd126c524a09b8d80c26ac1 (diff)
parente207432a412b8361a527098114490ed6bfdb9726 (diff)
Merge "Move isChangeReadyToBeEnqueued after pipeline requirements"
-rw-r--r--zuul/manager/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py
index 359d73d..326bbfd 100644
--- a/zuul/manager/__init__.py
+++ b/zuul/manager/__init__.py
@@ -277,11 +277,6 @@ class PipelineManager(object):
277 "ignoring" % change) 277 "ignoring" % change)
278 return True 278 return True
279 279
280 if not self.isChangeReadyToBeEnqueued(change):
281 self.log.debug("Change %s is not ready to be enqueued, ignoring" %
282 change)
283 return False
284
285 if not ignore_requirements: 280 if not ignore_requirements:
286 for f in self.ref_filters: 281 for f in self.ref_filters:
287 if f.connection_name != change.project.connection_name: 282 if f.connection_name != change.project.connection_name:
@@ -293,6 +288,11 @@ class PipelineManager(object):
293 "requirement %s" % (change, f)) 288 "requirement %s" % (change, f))
294 return False 289 return False
295 290
291 if not self.isChangeReadyToBeEnqueued(change):
292 self.log.debug("Change %s is not ready to be enqueued, ignoring" %
293 change)
294 return False
295
296 with self.getChangeQueue(change, change_queue) as change_queue: 296 with self.getChangeQueue(change, change_queue) as change_queue:
297 if not change_queue: 297 if not change_queue:
298 self.log.debug("Unable to find change queue for " 298 self.log.debug("Unable to find change queue for "