Merge "handle push error properly" into stable/rocky
This commit is contained in:
commit
728818cd8a
|
@ -300,6 +300,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."""
|
||||
|
||||
|
@ -323,6 +328,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
|
||||
|
@ -347,8 +355,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
|
||||
|
|
|
@ -83,6 +83,7 @@ class TasksTest(base.TestCase):
|
|||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
def test_push_image_failure(self, mock_client):
|
||||
"""failure on connecting Docker API"""
|
||||
self.dc = mock_client
|
||||
mock_client().push.side_effect = Exception
|
||||
pusher = build.PushTask(self.conf, self.image)
|
||||
|
@ -96,6 +97,7 @@ class TasksTest(base.TestCase):
|
|||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
def test_push_image_failure_retry(self, mock_client):
|
||||
"""failure on connecting Docker API, success on retry"""
|
||||
self.dc = mock_client
|
||||
mock_client().push.side_effect = [Exception, []]
|
||||
pusher = build.PushTask(self.conf, self.image)
|
||||
|
@ -112,6 +114,44 @@ class TasksTest(base.TestCase):
|
|||
self.assertTrue(pusher.success)
|
||||
self.assertEqual(build.STATUS_BUILT, self.image.status)
|
||||
|
||||
@mock.patch('docker.version', '3.0.0')
|
||||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
def test_push_image_failure_error(self, mock_client):
|
||||
"""Docker connected, failure to push"""
|
||||
self.dc = mock_client
|
||||
mock_client().push.return_value = [{'errorDetail': {'message':
|
||||
'mock push fail'}}]
|
||||
pusher = build.PushTask(self.conf, self.image)
|
||||
pusher.run()
|
||||
mock_client().push.assert_called_once_with(
|
||||
self.image.canonical_name, decode=True, stream=True)
|
||||
self.assertFalse(pusher.success)
|
||||
self.assertEqual(build.STATUS_PUSH_ERROR, self.image.status)
|
||||
|
||||
@mock.patch('docker.version', '3.0.0')
|
||||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
def test_push_image_failure_error_retry(self, mock_client):
|
||||
"""Docker connected, failure to push, success on retry"""
|
||||
self.dc = mock_client
|
||||
mock_client().push.return_value = [{'errorDetail': {'message':
|
||||
'mock push fail'}}]
|
||||
pusher = build.PushTask(self.conf, self.image)
|
||||
pusher.run()
|
||||
mock_client().push.assert_called_once_with(
|
||||
self.image.canonical_name, decode=True, stream=True)
|
||||
self.assertFalse(pusher.success)
|
||||
self.assertEqual(build.STATUS_PUSH_ERROR, self.image.status)
|
||||
|
||||
# Try again, this time without exception.
|
||||
mock_client().push.return_value = [{'stream': 'mock push passes'}]
|
||||
pusher.reset()
|
||||
pusher.run()
|
||||
self.assertEqual(2, mock_client().push.call_count)
|
||||
self.assertTrue(pusher.success)
|
||||
self.assertEqual(build.STATUS_BUILT, self.image.status)
|
||||
|
||||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
def test_build_image(self, mock_client):
|
||||
|
|
Loading…
Reference in New Issue