test: add a test to check for nested virtualization

tests/framework/properties.py

@@ -95,6 +95,11 @@ def __init__(self):
             self.instance = "NA"
             self.ami = "NA"
 
+    @property
+    def host_linux_version_tpl(self):
+        """Host Linux version major.minor, as a tuple for easy comparison"""
+        return tuple(int(x) for x in self.host_linux_version.split("."))
+
     @property
     def is_ec2(self):
         """Are we running on an EC2 instance?"""

tests/framework/utils_cpu_templates.py

@@ -23,16 +23,18 @@ def get_supported_cpu_templates():
     """
     Return the list of CPU templates supported by the platform.
     """
+    # pylint:disable=too-many-return-statements
     match cpuid_utils.get_cpu_vendor():
         case cpuid_utils.CpuVendor.INTEL:
             # T2CL template is only supported on Cascade Lake and newer CPUs.
-
             if global_props.cpu_codename == cpuid_utils.CpuModel.INTEL_SKYLAKE:
                 return sorted(set(INTEL_TEMPLATES) - set(["T2CL"]))
             return INTEL_TEMPLATES
         case cpuid_utils.CpuVendor.AMD:
             return AMD_TEMPLATES
         case cpuid_utils.CpuVendor.ARM:
+            if global_props.host_linux_version_tpl < (6, 1):
+                return []
             match global_props.cpu_model:
                 case cpuid_utils.CpuModel.ARM_NEOVERSE_N1:
                     return []
@@ -59,13 +61,14 @@ def get_supported_custom_cpu_templates():
     match cpuid_utils.get_cpu_vendor():
         case cpuid_utils.CpuVendor.INTEL:
             # T2CL template is only supported on Cascade Lake and newer CPUs.
-            skylake_model = "Intel(R) Xeon(R) Platinum 8175M CPU @ 2.50GHz"
-            if global_props.cpu_model == skylake_model:
+            if global_props.cpu_codename == cpuid_utils.CpuModel.INTEL_SKYLAKE:
                 return set(INTEL_TEMPLATES) - {"T2CL"}
             return INTEL_TEMPLATES
         case cpuid_utils.CpuVendor.AMD:
             return AMD_TEMPLATES
         case cpuid_utils.CpuVendor.ARM:
+            if global_props.host_linux_version_tpl < (6, 1):
+                return []
             match global_props.cpu_model:
                 case cpuid_utils.CpuModel.ARM_NEOVERSE_N1:
                     return AARCH64_CUSTOM_CPU_TEMPLATES_G2
@@ -87,10 +90,3 @@ def static_cpu_templates_params():
     """Return Static CPU templates as pytest parameters"""
     for name in sorted(get_supported_cpu_templates()):
         yield pytest.param(name, id="static_" + name)
-
-
-def nonci_on_arm(func):
-    """Temporary decorator used to mark specific cpu template related tests as nonci on ARM platforms"""
-    if cpuid_utils.get_cpu_vendor() == cpuid_utils.CpuVendor.ARM:
-        return pytest.mark.nonci(func)
-    return func

tests/integration_tests/functional/test_api.py

@@ -18,7 +18,6 @@
 import host_tools.network as net_tools
 from framework import utils_cpuid
 from framework.utils import get_firecracker_version_from_toml, is_io_uring_supported
-from framework.utils_cpu_templates import nonci_on_arm
 
 MEM_LIMIT = 1000000000
 
@@ -462,7 +461,6 @@ def test_negative_machine_config_api(test_microvm_with_api):
     )
 
 
-@nonci_on_arm
 def test_api_cpu_config(test_microvm_with_api, custom_cpu_template):
     """
     Test /cpu-config PUT scenarios.

tests/integration_tests/functional/test_cpu_features_aarch64.py

@@ -8,7 +8,6 @@
 import pytest
 
 import framework.utils_cpuid as cpuid_utils
-from framework.utils_cpu_templates import nonci_on_arm
 from framework.utils_cpuid import CpuModel
 
 PLATFORM = platform.machine()
@@ -94,7 +93,6 @@ def test_default_cpu_features(microvm_factory, guest_kernel, rootfs_ubuntu_22):
     PLATFORM != "aarch64",
     reason="This is aarch64 specific test.",
 )
-@nonci_on_arm
 def test_cpu_features_with_static_template(
     microvm_factory, guest_kernel, rootfs_ubuntu_22, cpu_template
 ):
@@ -115,7 +113,6 @@ def test_cpu_features_with_static_template(
     PLATFORM != "aarch64",
     reason="This is aarch64 specific test.",
 )
-@nonci_on_arm
 def test_cpu_features_with_custom_template(
     microvm_factory, guest_kernel, rootfs_ubuntu_22, custom_cpu_template
 ):

tests/integration_tests/functional/test_cpu_template_helper.py

@@ -11,7 +11,6 @@
 from framework import utils
 from framework.defs import SUPPORTED_HOST_KERNELS
 from framework.properties import global_props
-from framework.utils_cpu_templates import nonci_on_arm
 from framework.utils_cpuid import get_guest_cpuid
 from host_tools import cargo_build
 
@@ -405,7 +404,6 @@ def test_guest_cpu_config_change(
     )
 
 
-@nonci_on_arm
 def test_json_static_templates(
     test_microvm_with_api, cpu_template_helper, tmp_path, custom_cpu_template
 ):

tests/integration_tests/security/test_vulnerabilities.py

@@ -20,7 +20,6 @@
 )
 from framework.properties import global_props
 from framework.utils import CommandReturn
-from framework.utils_cpu_templates import nonci_on_arm
 
 CHECKER_URL = "https://meltdown.ovh"
 CHECKER_FILENAME = "spectre-meltdown-checker.sh"
@@ -299,7 +298,6 @@ def test_spectre_meltdown_checker_on_restored_guest(
     global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
     reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
 )
-@nonci_on_arm
 def test_spectre_meltdown_checker_on_guest_with_template(
     spectre_meltdown_checker, build_microvm_with_template
 ):
@@ -320,7 +318,6 @@ def test_spectre_meltdown_checker_on_guest_with_template(
     global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
     reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
 )
-@nonci_on_arm
 def test_spectre_meltdown_checker_on_guest_with_custom_template(
     spectre_meltdown_checker, build_microvm_with_custom_template
 ):
@@ -340,7 +337,6 @@ def test_spectre_meltdown_checker_on_guest_with_custom_template(
     global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
     reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
 )
-@nonci_on_arm
 def test_spectre_meltdown_checker_on_restored_guest_with_template(
     spectre_meltdown_checker, build_microvm_with_template, microvm_factory
 ):
@@ -363,7 +359,6 @@ def test_spectre_meltdown_checker_on_restored_guest_with_template(
     global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
     reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
 )
-@nonci_on_arm
 def test_spectre_meltdown_checker_on_restored_guest_with_custom_template(
     spectre_meltdown_checker,
     build_microvm_with_custom_template,
@@ -506,15 +501,13 @@ def test_vulnerabilities_files_on_restored_guest(build_microvm, microvm_factory)
     check_vulnerabilities_files_ab(with_restore(build_microvm, microvm_factory))
 
 
-@nonci_on_arm
 def test_vulnerabilities_files_on_guest_with_template(build_microvm_with_template):
     """
     Test vulnerabilities files on guest with CPU template.
     """
     check_vulnerabilities_files_ab(build_microvm_with_template)
 
 
-@nonci_on_arm
 def test_vulnerabilities_files_on_guest_with_custom_template(
     build_microvm_with_custom_template,
 ):
@@ -524,7 +517,6 @@ def test_vulnerabilities_files_on_guest_with_custom_template(
     check_vulnerabilities_files_ab(build_microvm_with_custom_template)
 
 
-@nonci_on_arm
 def test_vulnerabilities_files_on_restored_guest_with_template(
     build_microvm_with_template, microvm_factory
 ):
@@ -536,7 +528,6 @@ def test_vulnerabilities_files_on_restored_guest_with_template(
     )
 
 
-@nonci_on_arm
 def test_vulnerabilities_files_on_restored_guest_with_custom_template(
     build_microvm_with_custom_template, microvm_factory, custom_cpu_template
 ):