diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-27 15:14:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-27 15:14:10 +0000 |
| commit | a974fb216f9fa457dda1f1cd80c35186fcd73cc4 (patch) | |
| tree | 05f0efd852353fd081c469c999fb1dc9e46ffe55 | |
| parent | 4c22fa52c8a4b0bc8d0b83df33ea7f38956e1772 (diff) | |
| parent | 41dc35dc3145ad8933a9bf6a5f0580a85810a317 (diff) | |
| download | kolla-a974fb216f9fa457dda1f1cd80c35186fcd73cc4.tar.gz kolla-a974fb216f9fa457dda1f1cd80c35186fcd73cc4.zip | |
Merge "Skip [plugins,additions]-archive for binary builts"
| -rwxr-xr-x | kolla/image/build.py | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 28e3afe59..262513a2e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -418,26 +418,27 @@ class BuildTask(DockerTask): if image.status in STATUS_ERRORS: return - try: - plugins_am = make_an_archive(image.plugins, 'plugins') - except ArchivingError: - self.logger.error( - "Failed turning any plugins into a plugins archive") - return - else: - self.logger.debug( - "Turned %s plugins into plugins archive", - plugins_am) - try: - additions_am = make_an_archive(image.additions, 'additions') - except ArchivingError: - self.logger.error( - "Failed turning any additions into a additions archive") - return - else: - self.logger.debug( - "Turned %s additions into additions archive", - additions_am) + if self.conf.install_type == 'source': + try: + plugins_am = make_an_archive(image.plugins, 'plugins') + except ArchivingError: + self.logger.error( + "Failed turning any plugins into a plugins archive") + return + else: + self.logger.debug( + "Turned %s plugins into plugins archive", + plugins_am) + try: + additions_am = make_an_archive(image.additions, 'additions') + except ArchivingError: + self.logger.error( + "Failed turning any additions into a additions archive") + return + else: + self.logger.debug( + "Turned %s additions into additions archive", + additions_am) # Pull the latest image for the base distro only pull = self.conf.pull if image.parent is None else False |