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

@@ -31,7 +31,7 @@
 
 import host_tools.cargo_build as build_tools
 from framework import defs, utils
-from framework.artifacts import disks, kernel_params
+from framework.artifacts import disk_params, kernel_params
 from framework.defs import ARTIFACT_DIR, DEFAULT_BINARY_DIR
 from framework.microvm import HugePagesConfig, MicroVMFactory, SnapshotType
 from framework.properties import global_props
@@ -512,26 +512,33 @@ def guest_kernel_fxt(request, record_property):
 )
 
 
-@pytest.fixture
-def rootfs():
-    """Return an Ubuntu 24.04 read-only rootfs"""
-    disk_list = disks("ubuntu-24.04.squashfs")
-    if not disk_list:
-        pytest.fail(
-            f"No disk artifacts found matching 'ubuntu-24.04.squashfs' in {ARTIFACT_DIR}"
-        )
-    return disk_list[0]
+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
 
 
-@pytest.fixture
-def rootfs_rw():
-    """Return an Ubuntu 24.04 ext4 rootfs"""
-    disk_list = disks("ubuntu-24.04.ext4")
-    if not disk_list:
-        pytest.fail(
-            f"No disk artifacts found matching 'ubuntu-24.04.ext4' in {ARTIFACT_DIR}"
-        )
-    return disk_list[0]
+rootfs_ubuntu = pytest.fixture(rootfs_fxt, params=disk_params("ubuntu*.squashfs"))
+rootfs_al = pytest.fixture(rootfs_fxt, params=disk_params("amazonlinux*.squashfs"))
+rootfs_any = pytest.fixture(rootfs_fxt, params=disk_params("*.squashfs"))
+
+# Default ro rootfs used by tests
+rootfs = rootfs_ubuntu
+
+
+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
+
+
+rootfs_rw_ubuntu = pytest.fixture(rootfs_rw_fxt, params=disk_params("ubuntu*.ext4"))
+rootfs_rw_al = pytest.fixture(rootfs_rw_fxt, params=disk_params("amazonlinux*.ext4"))
+
+# Default rw rootfs used by tests
+rootfs_rw = rootfs_rw_ubuntu
 
 
 @pytest.fixture
@@ -575,12 +582,12 @@ def artifact_dir():
 
 
 @pytest.fixture
-def uvm_plain_any(microvm_factory, guest_kernel, rootfs, pci_enabled):
-    """All guest kernels
+def uvm_plain_any(microvm_factory, guest_kernel, rootfs_any, pci_enabled):
+    """All guest kernels and rootfs
     kernel: all
-    rootfs: Ubuntu 24.04
+    rootfs: Ubuntu 24.04 OR Amazon Linux 2023
     """
-    return microvm_factory.build(guest_kernel, rootfs, pci=pci_enabled)
+    return microvm_factory.build(guest_kernel, rootfs_any, pci=pci_enabled)
 
 
 guest_kernel_6_1_debug = pytest.fixture(

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")
+    ]