From af47fb332305d327f6dbdd2934d1e7e856c488d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Barb=C3=A1chano?= Date: Tue, 14 Nov 2023 16:17:34 +0100 Subject: [PATCH] fix(test): identify other CPUs as Skylake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit c5n.metal instances have an Skylake CPU like: Intel(R) Xeon(R) Platinum 8124M CPU Identify it as such. Signed-off-by: Pablo Barbáchano --- tests/framework/utils_cpu_templates.py | 4 ++-- tests/framework/utils_cpuid.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/framework/utils_cpu_templates.py b/tests/framework/utils_cpu_templates.py index cf3a57d2698..8f68f352336 100644 --- a/tests/framework/utils_cpu_templates.py +++ b/tests/framework/utils_cpu_templates.py @@ -26,8 +26,8 @@ def get_supported_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 sorted(set(INTEL_TEMPLATES) - set(["T2CL"])) return INTEL_TEMPLATES case cpuid_utils.CpuVendor.AMD: diff --git a/tests/framework/utils_cpuid.py b/tests/framework/utils_cpuid.py index 5ca9b876a43..91b5a3e035a 100644 --- a/tests/framework/utils_cpuid.py +++ b/tests/framework/utils_cpuid.py @@ -33,6 +33,7 @@ class CpuModel(str, Enum): CPU_DICT = { CpuVendor.INTEL: { "Intel(R) Xeon(R) Platinum 8175M CPU": "INTEL_SKYLAKE", + "Intel(R) Xeon(R) Platinum 8124M CPU": "INTEL_SKYLAKE", "Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE", "Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE", },