arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #260 from ajkavanagh/multi-lts-image-for-octavia

Browse Source 
The octavia tests require multiple LTS images
This commit is contained in:
Frode Nordahl
2020-05-14 06:24:24 +02:00
committed by GitHub
parent bc2377ccec c8ea324ccb
commit 78e992ac87
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zaza/openstack/charm_tests/octavia/setup.py
View File

@@ -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.

4
zaza/openstack/utilities/openstack.py
View File

@@ -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 = {