aboutsummaryrefslogtreecommitdiff
path: root/kolla/image
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-16 10:27:34 +0000
committerGerrit Code Review <review@openstack.org>2019-10-16 10:27:34 +0000
commitc6fc801279bbc2320b3dcc53f2f392ee5f87d86d (patch)
tree63381da528f3280e243e33479e6545d3f0a82d19 /kolla/image
parent218f24fa90d3aac2b0d7efd20e284f834da092f7 (diff)
parent52cac09d3d0b8dcdbc8d68a0bcc8092008220309 (diff)
downloadkolla-c6fc801279bbc2320b3dcc53f2f392ee5f87d86d.tar.gz
kolla-c6fc801279bbc2320b3dcc53f2f392ee5f87d86d.zip
Merge "handle push error properly"
Diffstat (limited to 'kolla/image')
-rwxr-xr-xkolla/image/build.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 102792408..0cd9274c5 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -321,6 +321,11 @@ class PushIntoQueueTask(task.Task):
self.success = True
+class PushError(Exception):
+ """Raised when there is a problem with pushing image to repository."""
+ pass
+
+
class PushTask(DockerTask):
"""Task that pushes an image to a docker repository."""
@@ -344,6 +349,9 @@ class PushTask(DockerTask):
' have the correct privileges to run Docker'
' (root)')
image.status = STATUS_CONNECTION_ERROR
+ except PushError as exception:
+ self.logger.error(exception)
+ image.status = STATUS_PUSH_ERROR
except Exception:
self.logger.exception('Unknown error when pushing')
image.status = STATUS_PUSH_ERROR
@@ -368,8 +376,7 @@ class PushTask(DockerTask):
if 'stream' in response:
self.logger.info(response['stream'])
elif 'errorDetail' in response:
- image.status = STATUS_ERROR
- self.logger.error(response['errorDetail']['message'])
+ raise PushError(response['errorDetail']['message'])
# Reset any previous errors.
image.status = STATUS_BUILT