test: generalize initrd test

Run it with all supported guest kernels, and handle the huge page
configuration via pytest parametrization, so that we do not have the
same test twice.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

tests/conftest.py

@@ -498,20 +498,6 @@ def uvm_plain_debug(microvm_factory, guest_kernel_6_1_debug, rootfs_rw):
     return microvm_factory.build(guest_kernel_6_1_debug, rootfs_rw)
 
 
-@pytest.fixture
-def uvm_with_initrd(
-    microvm_factory, guest_kernel_linux_5_10, record_property, artifact_dir
-):
-    """
-    See file:../docs/initrd.md
-    """
-    fs = artifact_dir / "initramfs.cpio"
-    record_property("rootfs", fs.name)
-    uvm = microvm_factory.build(guest_kernel_linux_5_10)
-    uvm.initrd_file = fs
-    yield uvm
-
-
 @pytest.fixture
 def vcpu_count():
     """Return default vcpu_count. Use indirect parametrization to override."""

tests/integration_tests/performance/test_huge_pages.py

@@ -7,10 +7,9 @@
 import pytest
 
 from framework import utils
-from framework.microvm import HugePagesConfig, Serial
+from framework.microvm import HugePagesConfig
 from framework.properties import global_props
 from framework.utils_ftrace import ftrace_events
-from integration_tests.functional.test_initrd import INITRD_FILESYSTEM
 from integration_tests.functional.test_uffd import SOCKET_PATH, spawn_pf_handler
 
 
@@ -252,27 +251,3 @@ def test_negative_huge_pages_plus_balloon(uvm_plain):
         match="Machine config error: Firecracker's huge pages support is incompatible with memory ballooning.",
     ):
         uvm_plain.basic_config(huge_pages=HugePagesConfig.HUGETLBFS_2MB)
-
-
-def test_negative_huge_pages_plus_initrd(uvm_with_initrd):
-    """Tests that huge pages and initrd cannot be used together"""
-    uvm_with_initrd.jailer.daemonize = False
-    uvm_with_initrd.spawn()
-    uvm_with_initrd.memory_monitor = None
-
-    # `basic_config` first does a PUT to /machine-config, which will apply the huge pages configuration,
-    # and then a PUT to /boot-source, which will register the initrd
-    uvm_with_initrd.basic_config(
-        boot_args="console=ttyS0 reboot=k panic=1 pci=off",
-        use_initrd=True,
-        huge_pages=HugePagesConfig.HUGETLBFS_2MB,
-        add_root_device=False,
-        vcpu_count=1,
-    )
-
-    uvm_with_initrd.start()
-    serial = Serial(uvm_with_initrd)
-    serial.open()
-    serial.rx(token="# ")
-    serial.tx("mount |grep rootfs")
-    serial.rx(token=f"rootfs on / type {INITRD_FILESYSTEM}")

tests/integration_tests/functional/test_initrd.py renamed to tests/integration_tests/performance/test_initrd.py

@@ -1,13 +1,27 @@
 # Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 """Tests for initrd."""
+import pytest
 
-from framework.microvm import Serial
+from framework.microvm import HugePagesConfig, Serial
 
 INITRD_FILESYSTEM = "rootfs"
 
 
-def test_microvm_initrd_with_serial(uvm_with_initrd):
+@pytest.fixture
+def uvm_with_initrd(microvm_factory, guest_kernel, record_property, artifact_dir):
+    """
+    See file:../docs/initrd.md
+    """
+    fs = artifact_dir / "initramfs.cpio"
+    record_property("rootfs", fs.name)
+    uvm = microvm_factory.build(guest_kernel)
+    uvm.initrd_file = fs
+    yield uvm
+
+
+@pytest.mark.parametrize("huge_pages", HugePagesConfig)
+def test_microvm_initrd_with_serial(uvm_with_initrd, huge_pages):
     """
     Test that a boot using initrd successfully loads the root filesystem.
     """
@@ -21,6 +35,7 @@ def test_microvm_initrd_with_serial(uvm_with_initrd):
         vcpu_count=1,
         boot_args="console=ttyS0 reboot=k panic=1 pci=off",
         use_initrd=True,
+        huge_pages=huge_pages,
     )
 
     vm.start()