From c04e632ae092dd91dcbb2f316b84c3c95ad75df9 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 6 May 2020 14:59:32 +0100 Subject: [PATCH 1/2] The octavia tests require multiple LTS images This patch ensures that bionic and focal images are available for the LTS octavia tests. --- zaza/openstack/charm_tests/octavia/setup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zaza/openstack/charm_tests/octavia/setup.py b/zaza/openstack/charm_tests/octavia/setup.py index 4f93097..55f8903 100644 --- a/zaza/openstack/charm_tests/octavia/setup.py +++ b/zaza/openstack/charm_tests/octavia/setup.py @@ -26,6 +26,12 @@ import zaza.openstack.utilities.openstack as openstack import zaza.openstack.configure.guest +def ensure_lts_images(): + """Ensure that bionic and focal images are available for the tests.""" + glance_setup.add_lts_image(image_name='bionic', release='bionic') + glance_setup.add_lts_image(image_name='focal', release='focal') + + def add_amphora_image(image_url=None): """Add Octavia ``amphora`` test image to glance. From c8ea324ccb3ff57e84ada7c07d054aaa4df8918b Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 7 May 2020 20:09:02 +0100 Subject: [PATCH 2/2] Add focal template to image list --- zaza/openstack/utilities/openstack.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py index 875071b..dc50a68 100644 --- a/zaza/openstack/utilities/openstack.py +++ b/zaza/openstack/utilities/openstack.py @@ -72,7 +72,9 @@ CIRROS_RELEASE_URL = 'http://download.cirros-cloud.net/version/released' CIRROS_IMAGE_URL = 'http://download.cirros-cloud.net' UBUNTU_IMAGE_URLS = { 'bionic': ('http://cloud-images.ubuntu.com/{release}/current/' - '{release}-server-cloudimg-{arch}.img') + '{release}-server-cloudimg-{arch}.img'), + 'focal': ('http://cloud-images.ubuntu.com/{release}/current/' + '{release}-server-cloudimg-{arch}.img'), } CHARM_TYPES = {