File tree Expand file tree Collapse file tree 2 files changed +2
-10
lines changed Expand file tree Collapse file tree 2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -377,11 +377,9 @@ def rootfs_fxt(request, record_property):
377
377
guest_kernel_linux_5_10 = pytest .fixture (
378
378
guest_kernel_fxt , params = kernel_params ("vmlinux-5.10*" )
379
379
)
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.
382
380
guest_kernel_linux_6_1 = pytest .fixture (
383
381
guest_kernel_fxt ,
384
- params = kernel_params ("vmlinux-6.1*" , select = kernels_unfiltered ),
382
+ params = kernel_params ("vmlinux-6.1*" ),
385
383
)
386
384
387
385
# Fixtures for all Ubuntu rootfs, and specific versions
Original file line number Diff line number Diff line change 12
12
import pytest
13
13
14
14
from framework .defs import ARTIFACT_DIR
15
- from framework .properties import global_props
16
15
from framework .utils import check_output , get_firecracker_version_from_toml
17
16
from framework .with_filelock import with_filelock
18
17
from host_tools .cargo_build import get_binary
@@ -22,8 +21,7 @@ def select_supported_kernels():
22
21
"""Select guest kernels supported by the current combination of kernel and
23
22
instance type.
24
23
"""
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+" ]
27
25
28
26
# Booting with MPTable is deprecated but we still want to test
29
27
# for it. Until we drop support for it we will be building a 5.10 guest
@@ -32,10 +30,6 @@ def select_supported_kernels():
32
30
# TODO: remove this once we drop support for MPTable
33
31
supported_kernels .append (r"vmlinux-5.10.\d+-no-acpi" )
34
32
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
-
39
33
return supported_kernels
40
34
41
35
You can’t perform that action at this time.
0 commit comments