openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Remove deprecated docker.py insecure_registy argument"

This commit is contained in:
Jenkins 2017-06-23 09:35:40 +00:00 committed by Gerrit Code Review
parent a6b0b2af4c 92f51c22ea
commit 48ae22f319
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_common/image/image_uploader.py
View File

@ -103,7 +103,7 @@ class DockerImageUploader(ImageUploader):
repo = pull_source + '/' + image
response = [line for line in dockerc.pull(repo,
tag=tag, stream=True, insecure_registry=True)]
tag=tag, stream=True)]
self.logger.debug(response)
full_image = repo + ':' + tag
@ -113,7 +113,7 @@ class DockerImageUploader(ImageUploader):
self.logger.debug(response)
response = [line for line in dockerc.push(new_repo,
tag=tag, stream=True, insecure_registry=True)]
tag=tag, stream=True)]
self.logger.debug(response)
self.logger.info('Completed upload for docker image %s' % image_name)

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

@ -141,14 +141,14 @@ class TestDockerImageUploader(base.TestCase):
self.dockermock.return_value.pull.assert_called_once_with(
pull_source + '/' + image,
tag=tag, stream=True, insecure_registry=True)
tag=tag, stream=True)
self.dockermock.return_value.tag.assert_called_once_with(
image=pull_source + '/' + image + ':' + tag,
repository=push_destination + '/' + image,
tag=tag, force=True)
self.dockermock.return_value.push(
push_destination + '/' + image,
tag=tag, stream=True, insecure_registry=True)
tag=tag, stream=True)
def test_upload_image_missing_tag(self):
image = 'tripleoupstream/heat-docker-agents-centos'
@ -165,11 +165,11 @@ class TestDockerImageUploader(base.TestCase):
self.dockermock.return_value.pull.assert_called_once_with(
pull_source + '/' + image,
tag=expected_tag, stream=True, insecure_registry=True)
tag=expected_tag, stream=True)
self.dockermock.return_value.tag.assert_called_once_with(
image=pull_source + '/' + image + ':' + expected_tag,
repository=push_destination + '/' + image,
tag=expected_tag, force=True)
self.dockermock.return_value.push(
push_destination + '/' + image,
tag=expected_tag, stream=True, insecure_registry=True)
tag=expected_tag, stream=True)