openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Tolerate ports in tag discover"

This commit is contained in:
Zuul 2017-12-01 11:22:39 +00:00 committed by Gerrit Code Review
parent 17f4d95984 451ba333ea
commit 4dd080d365
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_common/image/image_uploader.py
View File

@ -159,7 +159,10 @@ class DockerImageUploader(ImageUploader):
def discover_image_tag(self, image, tag_from_label=None):
dockerc = Client(base_url='unix://var/run/docker.sock', version='auto')
image_name, colon, tag = image.partition(':')
image_name, colon, tag = image.rpartition(':')
if not image_name:
image_name = tag
tag = None
if not tag:
tag = 'latest'
image = '%s:%s' % (image_name, tag)

17
tripleo_common/tests/image/test_image_uploader.py
View File

@ -196,6 +196,23 @@ class TestDockerImageUploader(base.TestCase):
self.assertRaises(ImageUploaderException,
self.uploader.discover_image_tag, image, 'foo')
def test_discover_image_tag_with_port(self):
image = 'foo:5000/t/heat-docker-agents-centos:latest'
vimage = 'foo:5000/t/heat-docker-agents-centos:1.2.3'
dockerc = self.dockermock.return_value
dockerc.pull.return_value = ['{"status": "done"}']
dockerc.inspect_image.return_value = {
'Config': {'Labels': {'image-version': '1.2.3'}}
}
result = self.uploader.discover_image_tag(image, 'image-version')
self.assertEqual('1.2.3', result)
dockerc.pull.assert_has_calls([
mock.call(image, tag=None, stream=True),
mock.call(vimage, tag=None, stream=True),
])
@mock.patch('time.sleep')
def test_pull_retry(self, sleep_mock):
image = 'docker.io/tripleoupstream/heat-docker-agents-centos'