From bccf2d4ebaa54265584fb23898fdb43cf92bd75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Barb=C3=A1chano?= Date: Tue, 14 Nov 2023 16:39:50 +0100 Subject: [PATCH] fix(test): depend on the CPU type rather than a specific instance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the tests work in other instances that use the same CPU. Signed-off-by: Pablo Barbáchano --- tests/framework/artifacts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/framework/artifacts.py b/tests/framework/artifacts.py index 358c63b6124..94d2507d8c1 100644 --- a/tests/framework/artifacts.py +++ b/tests/framework/artifacts.py @@ -25,7 +25,7 @@ def select_supported_kernels(): hlv = packaging.version.parse(global_props.host_linux_version) supported_kernels = [r"vmlinux-4.14.\d+"] if ( - global_props.instance == "c7g.metal" + global_props.cpu_model == "ARM_NEOVERSE_V1" and global_props.host_linux_version == "4.14" ): supported_kernels.append(r"vmlinux-5.10-no-sve.bin") @@ -33,7 +33,7 @@ def select_supported_kernels(): supported_kernels.append(r"vmlinux-5.10.\d+") # Support Linux 6.1 guest in a limited fashion - if global_props.instance == "c7g.metal" and (hlv.major, hlv.minor) >= (6, 1): + if global_props.cpu_model == "ARM_NEOVERSE_V1" and (hlv.major, hlv.minor) >= (6, 1): supported_kernels.append(r"vmlinux-6.1.\d+") return supported_kernels