openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Include both Ceph Octopus and Pacific in the content provider"

This commit is contained in:
Zuul 2021-04-14 02:11:29 +00:00 committed by Gerrit Code Review
parent 616136c83e b2860cacde
commit 5d8a8fedc1
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/tripleo_containers.yaml
View File

@ -189,3 +189,5 @@ container_images:
image_source: tripleo
- imagename: quay.io/tripleomaster/openstack-unbound:current-tripleo
image_source: tripleo
- imagename: quay.ceph.io/ceph-ci/daemon:v5.0.7-stable-5.0-octopus-centos-8-x86_64
image_source: ceph

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

@ -388,6 +388,17 @@ class TestKollaImageBuilderTemplate(base.TestCase):
for image in remove_images:
container_images.remove(image)
# todo(fultonj): remove kluge of this aspect of the test
# added extra ceph image only for side effect of having
# both ceph containers in content provider for transition
# https://bugs.launchpad.net/tripleo/+bug/1923529
extra_tag = 'v5.0.7-stable-5.0-octopus-centos-8-x86_64'
extra = {
'imagename': 'quay.ceph.io/ceph-ci/daemon:' + extra_tag,
'image_source': 'ceph'
}
result.append(extra)
self.assertSequenceEqual(container_images, result)
def test_container_images_yaml_in_sync(self):