Merge "Allow building images if parent was skipped"
This commit is contained in:
commit
cd26ef4224
@ -1290,7 +1290,9 @@ class KollaWorker(object):
|
|||||||
# were not matched in the first place... (not worth the
|
# were not matched in the first place... (not worth the
|
||||||
# effort to run them, if they won't be used anyway).
|
# effort to run them, if they won't be used anyway).
|
||||||
continue
|
continue
|
||||||
if image.parent is None:
|
# Build all root nodes, where a root is defined as having no parent
|
||||||
|
# or having a parent that is explicitly being skipped.
|
||||||
|
if image.parent is None or image.parent.status == STATUS_SKIPPED:
|
||||||
queue.put(BuildTask(self.conf, image, push_queue))
|
queue.put(BuildTask(self.conf, image, push_queue))
|
||||||
LOG.info('Added image %s to queue', image.name)
|
LOG.info('Added image %s to queue', image.name)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user