openstack
/
kolla
Code Issues Proposed changes

Merge "Skip [plugins,additions]-archive for binary builts"

This commit is contained in:
Jenkins 2017-06-27 15:14:10 +00:00 committed by Gerrit Code Review
parent 4c22fa52c8 41dc35dc31
commit a974fb216f
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kolla/image/build.py
View File

@ -418,26 +418,27 @@ class BuildTask(DockerTask):
if image.status in STATUS_ERRORS: if image.status in STATUS_ERRORS:
return return
try: if self.conf.install_type == 'source':
plugins_am = make_an_archive(image.plugins, 'plugins') try:
except ArchivingError: plugins_am = make_an_archive(image.plugins, 'plugins')
self.logger.error( except ArchivingError:
"Failed turning any plugins into a plugins archive") self.logger.error(
return "Failed turning any plugins into a plugins archive")
else: return
self.logger.debug( else:
"Turned %s plugins into plugins archive", self.logger.debug(
plugins_am) "Turned %s plugins into plugins archive",
try: plugins_am)
additions_am = make_an_archive(image.additions, 'additions') try:
except ArchivingError: additions_am = make_an_archive(image.additions, 'additions')
self.logger.error( except ArchivingError:
"Failed turning any additions into a additions archive") self.logger.error(
return "Failed turning any additions into a additions archive")
else: return
self.logger.debug( else:
"Turned %s additions into additions archive", self.logger.debug(
additions_am) "Turned %s additions into additions archive",
additions_am)
# Pull the latest image for the base distro only # Pull the latest image for the base distro only
pull = self.conf.pull if image.parent is None else False pull = self.conf.pull if image.parent is None else False