Skip to content

Commit

Permalink
Fix image pattern for FedoraSecondary provider on s390x
Browse files Browse the repository at this point in the history 
Updated the image pattern in FedoraSecondaryImageProvider to match
the available Fedora image file names for the s390x architecture.
This resolves the issue where the vmimage utility could not download
the correct image due to a pattern mismatch.

Reference: #6071
Signed-off-by: Harvey Lynden <[email protected]>
  • Loading branch information
@harvey0100
harvey0100 committed Dec 13, 2024
1 parent 91752d4 commit 3aff299
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 10 deletions.
14 changes: 12 additions & 2 deletions avocado/utils/vmimage.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,10 @@ def __init__(self, version="[0-9]+", build="[0-9]+.[0-9]+", arch=DEFAULT_ARCH):
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$"
if int(self.version) >= 40:
self.image_pattern = "Fedora-Cloud-Base-Generic-(?P<version>{version})-(?P<build>{build}).(?P<arch>{arch}).qcow2$"
else:
self.image_pattern = "Fedora-Cloud-Base-(?P<version>{version})-(?P<build>{build}).(?P<arch>{arch}).qcow2$"


class FedoraSecondaryImageProvider(FedoraImageProviderBase):
Expand All @@ -254,7 +257,10 @@ def __init__(self, version="[0-9]+", build="[0-9]+.[0-9]+", arch=DEFAULT_ARCH):
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$"
if int(self.version) >= 40:
self.image_pattern = "Fedora-Cloud-Base-Generic-(?P<version>{version})-(?P<build>{build}).(?P<arch>{arch}).qcow2$"

Check warning on line 261 in avocado/utils/vmimage.py

View check run for this annotation

Codecov / codecov/patch

avocado/utils/vmimage.py#L261 

Added line #L261 was not covered by tests
else:
self.image_pattern = "Fedora-Cloud-Base-(?P<version>{version})-(?P<build>{build}).(?P<arch>{arch}).qcow2$"


class CentOSImageProvider(ImageProviderBase):
Expand Down Expand Up @@ -585,6 +591,7 @@ def download(self):
cache_dirs = [self.cache_dir]
else:
cache_dirs = self.cache_dir
LOG.debug("Attempting to download image from URL: %s", self.url)

Check warning on line 594 in avocado/utils/vmimage.py

View check run for this annotation

Codecov / codecov/patch

avocado/utils/vmimage.py#L594 

Added line #L594 was not covered by tests
asset_path = asset.Asset(
name=self.url,
asset_hash=self.checksum,
Expand Down Expand Up @@ -657,6 +664,9 @@ def from_parameters(
:returns: Image instance that can provide the image
according to the parameters.
"""
# Use the current system architecture if arch is not provided
if arch is None:
arch = DEFAULT_ARCH

Check warning on line 669 in avocado/utils/vmimage.py

View check run for this annotation

Codecov / codecov/patch

avocado/utils/vmimage.py#L668-L669 

Added lines #L668 - L669 were not covered by tests
provider = get_best_provider(name, version, build, arch)

if cache_dir is None:
Expand Down
2 changes: 1 addition & 1 deletion selftests/check.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"job-api-check-tmp-directory-exists": 1,
"nrunner-interface": 70,
"nrunner-requirement": 28,
"unit": 681,
"unit": 682,
"jobs": 11,
"functional-parallel": 314,
"functional-serial": 7,
Expand Down
38 changes: 33 additions & 5 deletions selftests/unit/plugin/vmimage.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,39 @@ def _create_test_files(self, urlopen_mock):
"name": "Fedora",
"file": "Fedora-Cloud-Base-{version}-{build}.{arch}.qcow2",
"url": FEDORA_PAGE,
"mock_version": "30",
},
{
"name": "JeOS",
"file": "jeos-{version}-{arch}.qcow2.xz",
"url": JEOS_PAGE,
"mock_version": "27",
},
{
"name": "CirrOS",
"file": "cirros-{version}-{arch}-disk.img",
"url": CIRROS_PAGE,
"mock_version": "0.4.0",
},
]
cache_dir = self.mapping.get("cache_dirs")[0]
providers = [provider() for provider in vmimage_util.list_providers()]

providers = []
for provider_class in vmimage_util.list_providers():

with unittest.mock.patch.object(
provider_class, "get_version", return_value="30"
):
provider = provider_class()
provider._best_version = "30"
for image in expected_images:
if image["name"] == provider.name:
provider._best_version = image["mock_version"]
provider.get_version = unittest.mock.Mock(
return_value=image["mock_version"]
)
break
providers.append(provider)

for provider in providers:
for image in expected_images:
Expand Down Expand Up @@ -156,10 +175,19 @@ def test_list_downloaded_images(self):
with unittest.mock.patch("avocado.core.data_dir.settings", self.stg):
with unittest.mock.patch(
"avocado.utils.vmimage.ImageProviderBase.get_version"
):
images = sorted(
vmimage_plugin.list_downloaded_images(), key=lambda i: i["name"]
)
) as mock_base_version:
mock_base_version.return_value = "30"
with unittest.mock.patch(
"avocado.utils.vmimage.FedoraImageProvider.get_image_parameters"
) as mock_get_params:
mock_get_params.return_value = {
"version": "30",
"build": "1234",
"arch": "x86_64",
}
images = sorted(
vmimage_plugin.list_downloaded_images(), key=lambda i: i["name"]
)
for index, image in enumerate(images):
for key in image:
self.assertEqual(
Expand Down
22 changes: 20 additions & 2 deletions selftests/unit/utils/vmimage.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ class FedoraImageProvider(unittest.TestCase):
<img src="/icons/folder.gif" alt="[DIR]"> <a href="28/">28/</a> 2019-09-02 20:37 -
<img src="/icons/folder.gif" alt="[DIR]"> <a href="29/">29/</a> 2018-10-26 17:27 -
<img src="/icons/folder.gif" alt="[DIR]"> <a href="30/">30/</a> 2019-04-26 20:58 -
<img src="/icons/folder.gif" alt="[DIR]"> <a href="40/">40/</a> 2023-04-26 20:58 -
<img src="/icons/folder.gif" alt="[DIR]"> <a href="7/">7/</a> 2016-05-21 03:28 -
<img src="/icons/folder.gif" alt="[DIR]"> <a href="8/">8/</a> 2016-05-21 02:12 -
<img src="/icons/folder.gif" alt="[DIR]"> <a href="9/">9/</a> 2013-04-25 08:48 -
Expand All @@ -516,21 +517,37 @@ class FedoraImageProvider(unittest.TestCase):
</body></html>"""

@unittest.mock.patch("avocado.utils.vmimage.urlopen")
def test_get_image_parameters_match(self, urlopen_mock):
def test_get_image_parameters_match_pre_40(self, urlopen_mock):
expected_version = "30"
expected_arch = "x86_64"
expected_build = "1234"
urlread_mocked = unittest.mock.Mock(return_value=self.VERSION_LISTING)
urlopen_mock.return_value = unittest.mock.Mock(read=urlread_mocked)
provider = vmimage.FedoraImageProvider(
expected_version, expected_build, expected_arch
version=expected_version, build=expected_build, arch=expected_arch
)
image = f"Fedora-Cloud-Base-{expected_version}-{expected_build}.{expected_arch}.qcow2"
parameters = provider.get_image_parameters(image)
self.assertEqual(expected_version, parameters["version"])
self.assertEqual(expected_build, parameters["build"])
self.assertEqual(expected_arch, parameters["arch"])

@unittest.mock.patch("avocado.utils.vmimage.urlopen")
def test_get_image_parameters_match_post_40(self, urlopen_mock):
expected_version = "40"
expected_arch = "x86_64"
expected_build = "1234"
urlread_mocked = unittest.mock.Mock(return_value=self.VERSION_LISTING)
urlopen_mock.return_value = unittest.mock.Mock(read=urlread_mocked)
provider = vmimage.FedoraImageProvider(
version=expected_version, build=expected_build, arch=expected_arch
)
image = f"Fedora-Cloud-Base-Generic-{expected_version}-{expected_build}.{expected_arch}.qcow2"
parameters = provider.get_image_parameters(image)
self.assertEqual(expected_version, parameters["version"])
self.assertEqual(expected_build, parameters["build"])
self.assertEqual(expected_arch, parameters["arch"])

@unittest.mock.patch("avocado.utils.vmimage.urlopen")
def test_get_image_parameters_not_match(self, urlopen_mock):
urlread_mocked = unittest.mock.Mock(return_value=self.VERSION_LISTING)
Expand Down Expand Up @@ -573,6 +590,7 @@ def test_get_versions(self, urlopen_mock):
28,
29,
30,
40,
7,
8,
9,
Expand Down

0 comments on commit 3aff299

Please sign in to comment.