tests: modify rootfs fixtures for amazon linux

Now that we have an additional CI rootfs (amazon linux), our fixtures
must be modified accordingly. For now, the default is Amazon linux, and
new a new rootfs_any fixture has been created to be used by
uvm_plain_any.

TBD: running tests on both rootfs (via `uvm_plain_any`) adds 582
additional test cases. Do we really need this?

Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>

Author: JamesC1305

tests/conftest.py

@@ -512,25 +512,49 @@ def guest_kernel_fxt(request, record_property):
 )
 
 
+def rootfs_fxt(request):
+    """Return a read-only rootfs."""
+    if request.param is None:
+        pytest.fail(f"No disk artifacts found in {ARTIFACT_DIR}")
+    return request.param
+
+
+def rootfs_rw_fxt(request):
+    """Return a writeable rootfs."""
+    if request.param is None:
+        pytest.fail(f"No disk artifacts found in {ARTIFACT_DIR}")
+    return request.param
+
+
+def match_rootfs_to_kernel(request):
+    """For 5.10, use Ubuntu as rootfs, otherwise use AL2023.
+    Reason: AL2023 does not officially support 5.10"""
+    for name in request.fixturenames:
+        if name.startswith("guest_kernel"):
+            kernel = request.getfixturevalue(name)
+            if kernel and kernel.stem[2:] == "linux-5.10":
+                return "ubuntu"
+            break
+    return "amazonlinux"
+
+
 @pytest.fixture
-def rootfs():
-    """Return an Ubuntu 24.04 read-only rootfs"""
-    disk_list = disks("ubuntu-24.04.squashfs")
+def rootfs(request):
+    """Return a read-only rootfs. Ubuntu for 5.10, AL2023 for 6.1."""
+    distro = match_rootfs_to_kernel(request)
+    disk_list = disks(f"{distro}*.squashfs")
     if not disk_list:
-        pytest.fail(
-            f"No disk artifacts found matching 'ubuntu-24.04.squashfs' in {ARTIFACT_DIR}"
-        )
+        pytest.fail(f"No {distro} squashfs found in {ARTIFACT_DIR}")
     return disk_list[0]
 
 
 @pytest.fixture
-def rootfs_rw():
-    """Return an Ubuntu 24.04 ext4 rootfs"""
-    disk_list = disks("ubuntu-24.04.ext4")
+def rootfs_rw(request):
+    """Return a writeable rootfs. Ubuntu for 5.10, AL2023 for 6.1."""
+    distro = match_rootfs_to_kernel(request)
+    disk_list = disks(f"{distro}*.ext4")
     if not disk_list:
-        pytest.fail(
-            f"No disk artifacts found matching 'ubuntu-24.04.ext4' in {ARTIFACT_DIR}"
-        )
+        pytest.fail(f"No {distro} ext4 found in {ARTIFACT_DIR}")
     return disk_list[0]
 
 
@@ -578,7 +602,7 @@ def artifact_dir():
 def uvm_plain_any(microvm_factory, guest_kernel, rootfs, pci_enabled):
     """All guest kernels
     kernel: all
-    rootfs: Ubuntu 24.04
+    rootfs: Ubuntu for 5.10, AL2023 for 6.1
     """
     return microvm_factory.build(guest_kernel, rootfs, pci=pci_enabled)
 

tests/framework/artifacts.py

@@ -50,3 +50,10 @@ def kernel_params(glob="vmlinux-*", select=kernels, artifact_dir=ARTIFACT_DIR) -
     return [
         pytest.param(kernel, id=kernel.name) for kernel in select(glob, artifact_dir)
     ] or [pytest.param(None, id="no-kernel-found")]
+
+
+def disk_params(glob, select=disks):
+    """Return disk artifacts as pytest params"""
+    return [pytest.param(disk, id=disk.stem) for disk in select(glob)] or [
+        pytest.param(None, id="no-disk-found")
+    ]