Skip to content

Commit 312030d

Browse files
Manciukicbchalios
authored andcommitted
chore(tests): enable 6.1 guest kernel testing
This change enables 6.1 guest kernel for all the tests. Signed-off-by: Riccardo Mancini <mancio@amazon.com>
1 parent a364da8 commit 312030d

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

tests/conftest.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,9 @@ def rootfs_fxt(request, record_property):
377377
guest_kernel_linux_5_10 = pytest.fixture(
378378
guest_kernel_fxt, params=kernel_params("vmlinux-5.10*")
379379
)
380-
# Use the unfiltered selector, since we don't officially support 6.1 yet.
381-
# TODO: switch to default selector once we add full 6.1 support.
382380
guest_kernel_linux_6_1 = pytest.fixture(
383381
guest_kernel_fxt,
384-
params=kernel_params("vmlinux-6.1*", select=kernels_unfiltered),
382+
params=kernel_params("vmlinux-6.1*"),
385383
)
386384

387385
# Fixtures for all Ubuntu rootfs, and specific versions

tests/framework/artifacts.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import pytest
1313

1414
from framework.defs import ARTIFACT_DIR
15-
from framework.properties import global_props
1615
from framework.utils import check_output, get_firecracker_version_from_toml
1716
from framework.with_filelock import with_filelock
1817
from host_tools.cargo_build import get_binary
@@ -22,8 +21,7 @@ def select_supported_kernels():
2221
"""Select guest kernels supported by the current combination of kernel and
2322
instance type.
2423
"""
25-
hlv = packaging.version.parse(global_props.host_linux_version)
26-
supported_kernels = [r"vmlinux-4.14.\d+", r"vmlinux-5.10.\d+"]
24+
supported_kernels = [r"vmlinux-4.14.\d+", r"vmlinux-5.10.\d+", r"vmlinux-6.1.\d+"]
2725

2826
# Booting with MPTable is deprecated but we still want to test
2927
# for it. Until we drop support for it we will be building a 5.10 guest
@@ -32,10 +30,6 @@ def select_supported_kernels():
3230
# TODO: remove this once we drop support for MPTable
3331
supported_kernels.append(r"vmlinux-5.10.\d+-no-acpi")
3432

35-
# Support Linux 6.1 guest in a limited fashion
36-
if global_props.cpu_model == "ARM_NEOVERSE_V1" and (hlv.major, hlv.minor) >= (6, 1):
37-
supported_kernels.append(r"vmlinux-6.1.\d+")
38-
3933
return supported_kernels
4034

4135

0 commit comments

Comments
 (0)