openstack/tripleo-common
Code Issues Proposed changes

Switch to tripleomaster registry

Browse Source 
The tripleoupstream registry is deprecated in favor of tripleomaster,
where images are pushed automatically on rdo promotion.

Change-Id: I88770c12513f8dde977a770a3555652e4ed4596d
This commit is contained in:
Martin André 2017-12-08 17:15:15 +01:00
parent aa44e05495
commit 00bdb6f876
6 changed files with 210 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
container-images/overcloud_containers.yaml
View File

@ -1,98 +1,98 @@
container_images: container_images:
- imagename: docker.io/tripleoupstream/centos-binary-aodh-api:latest - imagename: docker.io/tripleomaster/centos-binary-aodh-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-aodh-evaluator:latest - imagename: docker.io/tripleomaster/centos-binary-aodh-evaluator:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-aodh-listener:latest - imagename: docker.io/tripleomaster/centos-binary-aodh-listener:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-aodh-notifier:latest - imagename: docker.io/tripleomaster/centos-binary-aodh-notifier:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-barbican-api:latest - imagename: docker.io/tripleomaster/centos-binary-barbican-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-barbican-keystone-listener:latest - imagename: docker.io/tripleomaster/centos-binary-barbican-keystone-listener:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-barbican-worker:latest - imagename: docker.io/tripleomaster/centos-binary-barbican-worker:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ceilometer-central:latest - imagename: docker.io/tripleomaster/centos-binary-ceilometer-central:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ceilometer-compute:latest - imagename: docker.io/tripleomaster/centos-binary-ceilometer-compute:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ceilometer-notification:latest - imagename: docker.io/tripleomaster/centos-binary-ceilometer-notification:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ceilometer-ipmi:latest - imagename: docker.io/tripleomaster/centos-binary-ceilometer-ipmi:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-cinder-api:latest - imagename: docker.io/tripleomaster/centos-binary-cinder-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-cinder-backup:latest - imagename: docker.io/tripleomaster/centos-binary-cinder-backup:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-cinder-scheduler:latest - imagename: docker.io/tripleomaster/centos-binary-cinder-scheduler:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-cinder-volume:latest - imagename: docker.io/tripleomaster/centos-binary-cinder-volume:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-collectd:latest - imagename: docker.io/tripleomaster/centos-binary-collectd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-congress-api:latest - imagename: docker.io/tripleomaster/centos-binary-congress-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-cron:latest - imagename: docker.io/tripleomaster/centos-binary-cron:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ec2-api:latest - imagename: docker.io/tripleomaster/centos-binary-ec2-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-etcd:latest - imagename: docker.io/tripleomaster/centos-binary-etcd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-fluentd:latest - imagename: docker.io/tripleomaster/centos-binary-fluentd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-glance-api:latest - imagename: docker.io/tripleomaster/centos-binary-glance-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-gnocchi-api:latest - imagename: docker.io/tripleomaster/centos-binary-gnocchi-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-gnocchi-metricd:latest - imagename: docker.io/tripleomaster/centos-binary-gnocchi-metricd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-gnocchi-statsd:latest - imagename: docker.io/tripleomaster/centos-binary-gnocchi-statsd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-haproxy:latest - imagename: docker.io/tripleomaster/centos-binary-haproxy:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-heat-all:latest - imagename: docker.io/tripleomaster/centos-binary-heat-all:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-heat-api-cfn:latest - imagename: docker.io/tripleomaster/centos-binary-heat-api-cfn:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-heat-api:latest - imagename: docker.io/tripleomaster/centos-binary-heat-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-heat-engine:latest - imagename: docker.io/tripleomaster/centos-binary-heat-engine:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-horizon:latest - imagename: docker.io/tripleomaster/centos-binary-horizon:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ironic-api:latest - imagename: docker.io/tripleomaster/centos-binary-ironic-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ironic-conductor:latest - imagename: docker.io/tripleomaster/centos-binary-ironic-conductor:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ironic-inspector:latest - imagename: docker.io/tripleomaster/centos-binary-ironic-inspector:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ironic-pxe:latest - imagename: docker.io/tripleomaster/centos-binary-ironic-pxe:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-iscsid:latest - imagename: docker.io/tripleomaster/centos-binary-iscsid:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-keepalived:latest - imagename: docker.io/tripleomaster/centos-binary-keepalived:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-keystone:latest - imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-manila-api:latest - imagename: docker.io/tripleomaster/centos-binary-manila-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-manila-base:latest - imagename: docker.io/tripleomaster/centos-binary-manila-base:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-manila-scheduler:latest - imagename: docker.io/tripleomaster/centos-binary-manila-scheduler:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-manila-share:latest - imagename: docker.io/tripleomaster/centos-binary-manila-share:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-mariadb:latest - imagename: docker.io/tripleomaster/centos-binary-mariadb:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-memcached:latest - imagename: docker.io/tripleomaster/centos-binary-memcached:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-mistral-api:latest - imagename: docker.io/tripleomaster/centos-binary-mistral-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-mistral-engine:latest - imagename: docker.io/tripleomaster/centos-binary-mistral-engine:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-mistral-executor:latest - imagename: docker.io/tripleomaster/centos-binary-mistral-executor:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-mistral-event-engine:latest - imagename: docker.io/tripleomaster/centos-binary-mistral-event-engine:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-multipathd:latest - imagename: docker.io/tripleomaster/centos-binary-multipathd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-dhcp-agent:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-dhcp-agent:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-l3-agent:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-l3-agent:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-metadata-agent:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-openvswitch-agent:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-openvswitch-agent:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-sriov-agent:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-sriov-agent:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-server:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-server:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-server-opendaylight:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-server-opendaylight:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-server-ovn:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-server-ovn:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-neutron-metadata-agent-ovn:latest - imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-api:latest - imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-compute-ironic:latest - imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-compute:latest - imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-conductor:latest - imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-consoleauth:latest - imagename: docker.io/tripleomaster/centos-binary-nova-consoleauth:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-libvirt:latest - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-novncproxy:latest - imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-placement-api:latest - imagename: docker.io/tripleomaster/centos-binary-nova-placement-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-nova-scheduler:latest - imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-novajoin-notifier:latest - imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-novajoin-server:latest - imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-octavia-base:latest - imagename: docker.io/tripleomaster/centos-binary-octavia-base:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-octavia-api:latest - imagename: docker.io/tripleomaster/centos-binary-octavia-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-octavia-health-manager:latest - imagename: docker.io/tripleomaster/centos-binary-octavia-health-manager:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-octavia-housekeeping:latest - imagename: docker.io/tripleomaster/centos-binary-octavia-housekeeping:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-octavia-worker:latest - imagename: docker.io/tripleomaster/centos-binary-octavia-worker:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-opendaylight:latest - imagename: docker.io/tripleomaster/centos-binary-opendaylight:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ovn-base:latest - imagename: docker.io/tripleomaster/centos-binary-ovn-base:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ovn-controller:latest - imagename: docker.io/tripleomaster/centos-binary-ovn-controller:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ovn-nb-db-server:latest - imagename: docker.io/tripleomaster/centos-binary-ovn-nb-db-server:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ovn-northd:latest - imagename: docker.io/tripleomaster/centos-binary-ovn-northd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-ovn-sb-db-server:latest - imagename: docker.io/tripleomaster/centos-binary-ovn-sb-db-server:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-panko-api:latest - imagename: docker.io/tripleomaster/centos-binary-panko-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-qdrouterd:latest - imagename: docker.io/tripleomaster/centos-binary-qdrouterd:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-rabbitmq:latest - imagename: docker.io/tripleomaster/centos-binary-rabbitmq:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-redis:latest - imagename: docker.io/tripleomaster/centos-binary-redis:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-sahara-api:latest - imagename: docker.io/tripleomaster/centos-binary-sahara-api:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-sahara-engine:latest - imagename: docker.io/tripleomaster/centos-binary-sahara-engine:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-sensu-client:latest - imagename: docker.io/tripleomaster/centos-binary-sensu-client:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-skydive-agent:latest - imagename: docker.io/tripleomaster/centos-binary-skydive-agent:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-skydive-analyzer:latest - imagename: docker.io/tripleomaster/centos-binary-skydive-analyzer:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-swift-account:latest - imagename: docker.io/tripleomaster/centos-binary-swift-account:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-swift-container:latest - imagename: docker.io/tripleomaster/centos-binary-swift-container:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-swift-object:latest - imagename: docker.io/tripleomaster/centos-binary-swift-object:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-swift-proxy-server:latest - imagename: docker.io/tripleomaster/centos-binary-swift-proxy-server:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-zaqar:latest - imagename: docker.io/tripleomaster/centos-binary-zaqar:current-tripleo
- imagename: docker.io/ceph/daemon:tag-stable-3.0-luminous-centos-7 - imagename: docker.io/ceph/daemon:tag-stable-3.0-luminous-centos-7
- imagename: docker.io/tripleoupstream/centos-binary-tempest:latest - imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
- imagename: docker.io/tripleoupstream/centos-binary-rsyslog-base:latest - imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo

9
releasenotes/notes/switch_to_tripleomaster_registry-bd795a51f4e572c9.yaml Normal file
View File

@ -0,0 +1,9 @@
---
feature:
- |
Switch to tripleomaster registry be default for container images, where
push happens automatically on RDO promotion.
deprecations:
- |
The tripleoupstream container registry is not used anymore and may be
retired in the future.

4
tripleo_common/image/kolla_builder.py
View File

@ -27,13 +27,13 @@ from tripleo_common.image import image_uploader
CONTAINER_IMAGES_DEFAULTS = { CONTAINER_IMAGES_DEFAULTS = {
'namespace': 'docker.io/tripleoupstream', 'namespace': 'docker.io/tripleomaster',
'ceph_namespace': 'docker.io/ceph', 'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon', 'ceph_image': 'daemon',
'ceph_tag': 'tag-stable-3.0-luminous-centos-7', 'ceph_tag': 'tag-stable-3.0-luminous-centos-7',
'name_prefix': 'centos-binary-', 'name_prefix': 'centos-binary-',
'name_suffix': '', 'name_suffix': '',
'tag': 'latest', 'tag': 'current-tripleo',
'neutron_driver': None, 'neutron_driver': None,
'logging': 'files' 'logging': 'files'
} }

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

@ -29,16 +29,16 @@ def create_disk_images():
def create_parsed_upload_images(): def create_parsed_upload_images():
uploads = [ uploads = [
{'imagename': 'docker.io/tripleoupstream/' {'imagename': 'docker.io/tripleomaster/'
'heat-docker-agents-centos:latest', 'heat-docker-agents-centos:latest',
'push_destination': 'localhost:8787'}, 'push_destination': 'localhost:8787'},
{'imagename': 'docker.io/tripleoupstream/' {'imagename': 'docker.io/tripleomaster/'
'centos-binary-nova-compute:liberty', 'centos-binary-nova-compute:liberty',
'push_destination': 'localhost:8787'}, 'push_destination': 'localhost:8787'},
{'imagename': 'docker.io/tripleoupstream/' {'imagename': 'docker.io/tripleomaster/'
'centos-binary-nova-libvirt:liberty', 'centos-binary-nova-libvirt:liberty',
'push_destination': 'localhost:8787'}, 'push_destination': 'localhost:8787'},
{'imagename': 'docker.io/tripleoupstream/' {'imagename': 'docker.io/tripleomaster/'
'image-with-missing-tag', 'image-with-missing-tag',
'push_destination': 'localhost:8787'}, 'push_destination': 'localhost:8787'},
] ]

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

@ -27,12 +27,12 @@ from tripleo_common.tests.image import fakes
filedata = six.u( filedata = six.u(
"""container_images: """container_images:
- imagename: docker.io/tripleoupstream/heat-docker-agents-centos:latest - imagename: docker.io/tripleomaster/heat-docker-agents-centos:latest
push_destination: localhost:8787 push_destination: localhost:8787
- imagename: docker.io/tripleoupstream/centos-binary-nova-compute:liberty - imagename: docker.io/tripleomaster/centos-binary-nova-compute:liberty
push_destination: localhost:8787 push_destination: localhost:8787
- imagename: docker.io/tripleoupstream/centos-binary-nova-libvirt:liberty - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:liberty
- imagename: docker.io/tripleoupstream/image-with-missing-tag - imagename: docker.io/tripleomaster/image-with-missing-tag
push_destination: localhost:8787 push_destination: localhost:8787
""") """)
@ -70,22 +70,22 @@ class TestImageUploadManager(base.TestCase):
dockerc = mockdocker.return_value dockerc = mockdocker.return_value
dockerc.remove_image.assert_has_calls([ dockerc.remove_image.assert_has_calls([
mock.call('docker.io/tripleoupstream' mock.call('docker.io/tripleomaster'
'/centos-binary-nova-compute:liberty'), '/centos-binary-nova-compute:liberty'),
mock.call('docker.io/tripleoupstream' mock.call('docker.io/tripleomaster'
'/centos-binary-nova-libvirt:liberty'), '/centos-binary-nova-libvirt:liberty'),
mock.call('docker.io/tripleoupstream' mock.call('docker.io/tripleomaster'
'/heat-docker-agents-centos:latest'), '/heat-docker-agents-centos:latest'),
mock.call('docker.io/tripleoupstream' mock.call('docker.io/tripleomaster'
'/image-with-missing-tag:latest'), '/image-with-missing-tag:latest'),
mock.call('localhost:8787/tripleoupstream' mock.call('localhost:8787/tripleomaster'
'/centos-binary-nova-compute:liberty'), '/centos-binary-nova-compute:liberty'),
mock.call('localhost:8787/tripleoupstream' mock.call('localhost:8787/tripleomaster'
'/centos-binary-nova-libvirt:liberty'), '/centos-binary-nova-libvirt:liberty'),
mock.call('localhost:8787/tripleoupstream' mock.call('localhost:8787/tripleomaster'
'/heat-docker-agents-centos:latest'), '/heat-docker-agents-centos:latest'),
mock.call('localhost:8787/tripleoupstream/' mock.call('localhost:8787/tripleomaster/'
'image-with-missing-tag:latest'), 'image-with-missing-tag:latest'),
]) ])
@ -134,10 +134,10 @@ class TestDockerImageUploader(base.TestCase):
mock_process.returncode = 0 mock_process.returncode = 0
mock_popen.return_value = mock_process mock_popen.return_value = mock_process
image = 'docker.io/tripleoupstream/heat-docker-agents-centos' image = 'docker.io/tripleomaster/heat-docker-agents-centos'
tag = 'latest' tag = 'latest'
push_destination = 'localhost:8787' push_destination = 'localhost:8787'
push_image = 'localhost:8787/tripleoupstream/heat-docker-agents-centos' push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos'
self.uploader.upload_image(image + ':' + tag, self.uploader.upload_image(image + ':' + tag,
None, None,
@ -159,10 +159,10 @@ class TestDockerImageUploader(base.TestCase):
@mock.patch('subprocess.Popen') @mock.patch('subprocess.Popen')
def test_upload_image_missing_tag(self, mock_popen): def test_upload_image_missing_tag(self, mock_popen):
image = 'docker.io/tripleoupstream/heat-docker-agents-centos' image = 'docker.io/tripleomaster/heat-docker-agents-centos'
expected_tag = 'latest' expected_tag = 'latest'
push_destination = 'localhost:8787' push_destination = 'localhost:8787'
push_image = 'localhost:8787/tripleoupstream/heat-docker-agents-centos' push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos'
self.uploader.upload_image(image, self.uploader.upload_image(image,
None, None,
@ -191,7 +191,7 @@ class TestDockerImageUploader(base.TestCase):
mock_process.communicate.return_value = (json.dumps(result), '') mock_process.communicate.return_value = (json.dumps(result), '')
mock_process.returncode = 0 mock_process.returncode = 0
mock_popen.return_value = mock_process mock_popen.return_value = mock_process
image = 'docker.io/tripleoupstream/heat-docker-agents-centos' image = 'docker.io/tripleomaster/heat-docker-agents-centos'
tag = 'latest' tag = 'latest'
push_destination = 'localhost:8787' push_destination = 'localhost:8787'
@ -390,7 +390,7 @@ class TestDockerImageUploader(base.TestCase):
@mock.patch('time.sleep') @mock.patch('time.sleep')
def test_pull_retry(self, sleep_mock): def test_pull_retry(self, sleep_mock):
image = 'docker.io/tripleoupstream/heat-docker-agents-centos' image = 'docker.io/tripleomaster/heat-docker-agents-centos'
dockerc = self.dockermock.return_value dockerc = self.dockermock.return_value
dockerc.pull.side_effect = [ dockerc.pull.side_effect = [
@ -409,7 +409,7 @@ class TestDockerImageUploader(base.TestCase):
@mock.patch('time.sleep') @mock.patch('time.sleep')
def test_pull_retry_failure(self, sleep_mock): def test_pull_retry_failure(self, sleep_mock):
image = 'docker.io/tripleoupstream/heat-docker-agents-centos' image = 'docker.io/tripleomaster/heat-docker-agents-centos'
dockerc = self.dockermock.return_value dockerc = self.dockermock.return_value
dockerc.pull.side_effect = [ dockerc.pull.side_effect = [

159
tripleo_common/tests/image/test_kolla_builder.py
View File

@ -34,14 +34,14 @@ TEMPLATE_PATH = os.path.join(os.path.dirname(__file__),
filedata = six.u("""container_images: filedata = six.u("""container_images:
- imagename: docker.io/tripleoupstream/heat-docker-agents-centos:latest - imagename: docker.io/tripleomaster/heat-docker-agents-centos:latest
push_destination: localhost:8787 push_destination: localhost:8787
- imagename: docker.io/tripleoupstream/centos-binary-nova-compute:liberty - imagename: docker.io/tripleomaster/centos-binary-nova-compute:liberty
uploader: docker uploader: docker
push_destination: localhost:8787 push_destination: localhost:8787
- imagename: docker.io/tripleoupstream/centos-binary-nova-libvirt:liberty - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:liberty
uploader: docker uploader: docker
- imagename: docker.io/tripleoupstream/image-with-missing-tag - imagename: docker.io/tripleomaster/image-with-missing-tag
push_destination: localhost:8787 push_destination: localhost:8787
""") """)
@ -72,11 +72,12 @@ class TestKollaImageBuilder(base.TestCase):
self.assertIsNone(itr('')) self.assertIsNone(itr(''))
self.assertIsNone(itr(None)) self.assertIsNone(itr(None))
self.assertEqual('foo', itr('foo')) self.assertEqual('foo', itr('foo'))
self.assertEqual('foo', itr('foo:latest')) self.assertEqual('foo', itr('foo:current-tripleo'))
self.assertEqual('foo', itr('tripleo/foo:latest')) self.assertEqual('foo', itr('tripleo/foo:current-tripleo'))
self.assertEqual('foo', itr('tripleo/foo')) self.assertEqual('foo', itr('tripleo/foo'))
self.assertEqual('foo', itr('tripleo/centos-binary-foo:latest')) self.assertEqual('foo',
self.assertEqual('foo', itr('centos-binary-foo:latest')) itr('tripleo/centos-binary-foo:current-tripleo'))
self.assertEqual('foo', itr('centos-binary-foo:current-tripleo'))
self.assertEqual('foo', itr('centos-binary-foo')) self.assertEqual('foo', itr('centos-binary-foo'))
@mock.patch('tripleo_common.image.base.open', @mock.patch('tripleo_common.image.base.open',
@ -163,14 +164,14 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual( self.assertEqual(
{ {
'namespace': 'docker.io/tripleoupstream', 'namespace': 'docker.io/tripleomaster',
'ceph_namespace': 'docker.io/ceph', 'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon', 'ceph_image': 'daemon',
'ceph_tag': 'tag-stable-3.0-luminous-centos-7', 'ceph_tag': 'tag-stable-3.0-luminous-centos-7',
'logging': 'files', 'logging': 'files',
'name_prefix': 'centos-binary-', 'name_prefix': 'centos-binary-',
'name_suffix': '', 'name_suffix': '',
'tag': 'latest', 'tag': 'current-tripleo',
'neutron_driver': None 'neutron_driver': None
}, },
builder.container_images_template_inputs() builder.container_images_template_inputs()
@ -178,7 +179,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual( self.assertEqual(
{ {
'namespace': '192.0.2.0:5000/tripleoupstream', 'namespace': '192.0.2.0:5000/tripleomaster',
'ceph_namespace': 'docker.io/cephh', 'ceph_namespace': 'docker.io/cephh',
'ceph_image': 'ceph-daemon', 'ceph_image': 'ceph-daemon',
'ceph_tag': 'latest', 'ceph_tag': 'latest',
@ -189,7 +190,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'neutron_driver': 'ovn' 'neutron_driver': 'ovn'
}, },
builder.container_images_template_inputs( builder.container_images_template_inputs(
namespace='192.0.2.0:5000/tripleoupstream', namespace='192.0.2.0:5000/tripleomaster',
ceph_namespace='docker.io/cephh', ceph_namespace='docker.io/cephh',
ceph_image='ceph-daemon', ceph_image='ceph-daemon',
ceph_tag='latest', ceph_tag='latest',
@ -219,17 +220,17 @@ class TestKollaImageBuilderTemplate(base.TestCase):
tag='liberty' tag='liberty'
) )
container_images = [{ container_images = [{
'imagename': 'docker.io/tripleoupstream/' 'imagename': 'docker.io/tripleomaster/'
'centos-binary-nova-compute:liberty', 'centos-binary-nova-compute:liberty',
'push_destination': 'localhost:8787', 'push_destination': 'localhost:8787',
'uploader': 'docker' 'uploader': 'docker'
}, { }, {
'imagename': 'docker.io/tripleoupstream/' 'imagename': 'docker.io/tripleomaster/'
'centos-binary-nova-libvirt:liberty', 'centos-binary-nova-libvirt:liberty',
'push_destination': 'localhost:8787', 'push_destination': 'localhost:8787',
'uploader': 'docker' 'uploader': 'docker'
}, { }, {
'imagename': 'docker.io/tripleoupstream/image-with-missing-tag', 'imagename': 'docker.io/tripleomaster/image-with-missing-tag',
'push_destination': 'localhost:8787' 'push_destination': 'localhost:8787'
}] }]
self.assertEqual(container_images, result) self.assertEqual(container_images, result)
@ -272,87 +273,87 @@ class TestKollaImageBuilderTemplate(base.TestCase):
def test_container_images_yaml_in_sync(self): def test_container_images_yaml_in_sync(self):
remove_images = [ remove_images = [
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-opendaylight:latest'}, '-neutron-server-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-ovn:latest'}, '-neutron-server-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-ovn-base:latest'}, '-ovn-base:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-opendaylight:latest'}, '-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-ovn-northd:latest'}, '-ovn-northd:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'controller:latest'}, 'controller:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'nb-db-server:latest'}, 'nb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'sb-db-server:latest'}, 'sb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-metadata-agent-ovn:latest'}, '-neutron-metadata-agent-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-rsyslog-base:latest'}] '-rsyslog-base:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper( self._test_container_images_yaml_in_sync_helper(
remove_images=remove_images) remove_images=remove_images)
def test_container_images_yaml_in_sync_for_odl(self): def test_container_images_yaml_in_sync_for_odl(self):
# remove neutron-server image reference from overcloud_containers.yaml # remove neutron-server image reference from overcloud_containers.yaml
remove_images = [ remove_images = [
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server:latest'}, '-neutron-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-ovn:latest'}, '-neutron-server-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-ovn-base:latest'}, '-ovn-base:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-ovn-northd:latest'}, '-ovn-northd:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'controller:latest'}, 'controller:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'nb-db-server:latest'}, 'nb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'sb-db-server:latest'}, 'sb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-metadata-agent-ovn:latest'}, '-neutron-metadata-agent-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-rsyslog-base:latest'}] '-rsyslog-base:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper( self._test_container_images_yaml_in_sync_helper(
neutron_driver='odl', remove_images=remove_images) neutron_driver='odl', remove_images=remove_images)
def test_container_images_yaml_in_sync_for_ovn(self): def test_container_images_yaml_in_sync_for_ovn(self):
# remove neutron-server image reference from overcloud_containers.yaml # remove neutron-server image reference from overcloud_containers.yaml
remove_images = [ remove_images = [
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server:latest'}, '-neutron-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-opendaylight:latest'}, '-neutron-server-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-opendaylight:latest'}, '-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-rsyslog-base:latest'}] '-rsyslog-base:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper( self._test_container_images_yaml_in_sync_helper(
neutron_driver='ovn', remove_images=remove_images) neutron_driver='ovn', remove_images=remove_images)
def test_container_images_yaml_in_sync_for_stdout_logging(self): def test_container_images_yaml_in_sync_for_stdout_logging(self):
remove_images = [ remove_images = [
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-opendaylight:latest'}, '-neutron-server-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-ovn:latest'}, '-neutron-server-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-ovn-base:latest'}, '-ovn-base:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-opendaylight:latest'}, '-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'northd:latest'}, 'northd:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'controller:latest'}, 'controller:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'nb-db-server:latest'}, 'nb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-' {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'sb-db-server:latest'}, 'sb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleoupstream/centos-binary' {'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-metadata-agent-ovn:latest'}] '-neutron-metadata-agent-ovn:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper( self._test_container_images_yaml_in_sync_helper(
remove_images=remove_images, logging='stdout') remove_images=remove_images, logging='stdout')