Merge branch 'main' into seccomp-cleanup

firecracker-microvm · Dec 4, 2024 · 6c51473 · 6c51473
2 parents 3adafa9 + 81bae9f
commit 6c51473
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/framework/utils_cpuid.py b/tests/framework/utils_cpuid.py
@@ -25,6 +25,7 @@ class CpuModel(str, Enum):
     """CPU models"""
 
     AMD_MILAN = "AMD_MILAN"
+    AMD_GENOA = "AMD_GENOA"
     ARM_NEOVERSE_N1 = "ARM_NEOVERSE_N1"
     ARM_NEOVERSE_V1 = "ARM_NEOVERSE_V1"
     INTEL_SKYLAKE = "INTEL_SKYLAKE"
@@ -39,9 +40,7 @@ class CpuModel(str, Enum):
         "Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE",
         "Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE",
     },
-    CpuVendor.AMD: {
-        "AMD EPYC 7R13": "AMD_MILAN",
-    },
+    CpuVendor.AMD: {"AMD EPYC 7R13": "AMD_MILAN", "AMD EPYC 9R14": "AMD_GENOA"},
     CpuVendor.ARM: {"0xd0c": "ARM_NEOVERSE_N1", "0xd40": "ARM_NEOVERSE_V1"},
 }
 

diff --git a/tests/integration_tests/functional/test_cpu_features_x86_64.py b/tests/integration_tests/functional/test_cpu_features_x86_64.py
@@ -486,9 +486,14 @@ def test_host_vs_guest_cpu_features_x86_64(uvm_nano):
                 "hypervisor",
                 "tsc_known_freq",
             }
+        case CpuModel.AMD_GENOA:
+            # Return here to allow the test to pass until CPU features to enable are confirmed
+            return
         case _:
             if os.environ.get("BUILDKITE") is not None:
-                assert False, f"Cpu model {cpu_model} is not supported"
+                assert (
+                    guest_feats == host_feats
+                ), f"Cpu model {cpu_model} is not supported"
 
 
 # From the `Intel® 64 Architecture x2APIC Specification`