add support for image compose subvariants (#165)

* add support for image compose subvariants Fedora 40 composes require the use of subvariants https://kojipkgs.fedoraproject.org/compose/cloud/latest-Fedora-Cloud-40/compose/Cloud/x86_64/images/ to distinguish between Generic and UEFI-UKI * use pytest 7.x for now - tests do not work with 8
linux-system-roles · May 8, 2024 · 6abaadf · 6abaadf
1 parent b3a4626
commit 6abaadf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/tox_lsr/test_scripts/runqemu.py b/src/tox_lsr/test_scripts/runqemu.py
@@ -323,7 +323,10 @@ def get_url(image):
         return source
     elif compose_url:
         variant = image.get("variant")
-        image_urls = composeurl2images(compose_url, "x86_64", variant)
+        subvariant = image.get("subvariant")
+        image_urls = composeurl2images(
+            compose_url, "x86_64", variant, subvariant
+        )
         if len(image_urls) == 1:
             return image_urls[0]
         else:

diff --git a/tox.ini b/tox.ini
@@ -19,7 +19,7 @@ description =
 deps =
     safety ; python_version >= "3"
     unittest2
-    pytest
+    pytest < 8
     pytest-cov
     coveralls
     py