aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-10 09:22:51 +0000
committerGerrit Code Review <review@openstack.org>2016-11-10 09:22:51 +0000
commitd15eb07ba8e592d975e59f4ef007eede81c004f9 (patch)
tree6d2700014550ef3e5f1c3872af3945336cc04fe8
parentc06d2c99375968aeed5724ea8da5511ebe5865e9 (diff)
parent27a16ccf76177413cc8f6c174eeb7dbff0a717a1 (diff)
downloadkolla-d15eb07ba8e592d975e59f4ef007eede81c004f9.tar.gz
kolla-d15eb07ba8e592d975e59f4ef007eede81c004f9.zip
Merge "Skip queuing build tasks for UNMATCHED images"
-rw-r--r--kolla/image/build.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 7ec842371..b1388f15b 100644
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -926,6 +926,11 @@ class KollaWorker(object):
queue = six.moves.queue.Queue()
for image in self.images:
+ if image.status == STATUS_UNMATCHED:
+ # Don't bother queuing up build tasks for things that
+ # were not matched in the first place... (not worth the
+ # effort to run them, if they won't be used anyway).
+ continue
if image.parent is None:
queue.put(BuildTask(self.conf, image, push_queue))
LOG.info('Added image %s to queue', image.name)