Skip to content

Commit

Permalink
vmimage: fix fedora image provider for older images
Browse files Browse the repository at this point in the history
Old (version<32) fedora images now are stored at different server.
This patch adds urls of that servers for base and secondary
fedora image providers.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
  • Loading branch information
Dovgalyuk committed Jan 27, 2021
1 parent bc0a48b commit e4d67e9
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions avocado/utils/vmimage.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,19 @@ class FedoraImageProviderBase(ImageProviderBase):
"""

HTML_ENCODING = 'iso-8859-1'
url_old_images = None

def get_image_url(self):
if int(self.version) >= 28:
cloud = 'Cloud'
else:
cloud = 'CloudImages'
self.url_images = self.url_images % cloud

if self.url_old_images and int(self.version) <= 31:
self.url_versions = self.url_old_images

self.url_images = self.url_versions + '{version}/' \
+ cloud + '/{arch}/images/'
return super(FedoraImageProviderBase, self).get_image_url()


Expand All @@ -220,7 +226,7 @@ def __init__(self, version='[0-9]+', build='[0-9]+.[0-9]+',
arch=DEFAULT_ARCH):
super(FedoraImageProvider, self).__init__(version, build, arch)
self.url_versions = 'https://dl.fedoraproject.org/pub/fedora/linux/releases/'
self.url_images = self.url_versions + '{version}/%s/{arch}/images/'
self.url_old_images = 'https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/'
self.image_pattern = 'Fedora-Cloud-Base-(?P<version>{version})-(?P<build>{build}).(?P<arch>{arch}).qcow2$'


Expand All @@ -236,7 +242,7 @@ def __init__(self, version='[0-9]+', build='[0-9]+.[0-9]+',
super(FedoraSecondaryImageProvider, self).__init__(version, build,
arch)
self.url_versions = 'https://dl.fedoraproject.org/pub/fedora-secondary/releases/'
self.url_images = self.url_versions + '{version}/%s/{arch}/images/'
self.url_old_images = 'https://archives.fedoraproject.org/pub/archive/fedora-secondary/releases/'
self.image_pattern = 'Fedora-Cloud-Base-(?P<version>{version})-(?P<build>{build}).(?P<arch>{arch}).qcow2$'


Expand Down

0 comments on commit e4d67e9

Please sign in to comment.