Skip to content

Commit 19fdcd8

Browse files
pb8oShadowCurse
authored andcommitted
chore(ci/linux-4.14): stop testing host kernel 4.14
Kernel 4.14 has reached End of Life and is not supported by upstream. This should also reduce our CI costs by 1/3. Signed-off-by: Pablo Barbáchano <[email protected]>
1 parent 4cd47bd commit 19fdcd8

File tree

5 files changed

+3
-35
lines changed

5 files changed

+3
-35
lines changed

.buildkite/common.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
]
2424

2525
DEFAULT_PLATFORMS = [
26-
("al2", "linux_4.14"),
2726
("al2", "linux_5.10"),
2827
("al2023", "linux_6.1"),
2928
]

tests/framework/artifacts.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,7 @@ def select_supported_kernels():
2323
instance type.
2424
"""
2525
hlv = packaging.version.parse(global_props.host_linux_version)
26-
supported_kernels = [r"vmlinux-4.14.\d+"]
27-
if (
28-
global_props.cpu_model == "ARM_NEOVERSE_V1"
29-
and global_props.host_linux_version == "4.14"
30-
):
31-
supported_kernels.append(r"vmlinux-5.10-no-sve.bin")
32-
else:
33-
supported_kernels.append(r"vmlinux-5.10.\d+")
26+
supported_kernels = [r"vmlinux-4.14.\d+", r"vmlinux-5.10.\d+"]
3427

3528
# Booting with MPTable is deprecated but we still want to test
3629
# for it. Until we drop support for it we will be building a 5.10 guest

tests/framework/defs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# Firecracker.
3131
MIN_KERNEL_VERSION_FOR_IO_URING = "5.10.51"
3232

33-
SUPPORTED_HOST_KERNELS = ["4.14", "5.10", "6.1"]
33+
SUPPORTED_HOST_KERNELS = ["5.10", "6.1"]
3434

3535
IMG_DIR = Path(DEFAULT_TEST_SESSION_ROOT_PATH) / "img"
3636

tests/integration_tests/performance/test_huge_pages.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ def check_hugetlbfs_in_use(pid: int, allocation_name: str):
5555
assert kernel_page_size_kib > 4
5656

5757

58-
@pytest.mark.skipif(
59-
global_props.host_linux_version == "4.14",
60-
reason="MFD_HUGETLB | MFD_ALLOW_SEALING only supported on kernels >= 4.16",
61-
)
6258
def test_hugetlbfs_boot(uvm_plain):
6359
"""Tests booting a microvm with guest memory backed by 2MB hugetlbfs pages"""
6460

@@ -74,10 +70,6 @@ def test_hugetlbfs_boot(uvm_plain):
7470
)
7571

7672

77-
@pytest.mark.skipif(
78-
global_props.host_linux_version == "4.14",
79-
reason="MFD_HUGETLB | MFD_ALLOW_SEALING only supported on kernels >= 4.16",
80-
)
8173
def test_hugetlbfs_snapshot(
8274
microvm_factory, guest_kernel_linux_5_10, rootfs_ubuntu_22, uffd_handler_paths
8375
):
@@ -115,10 +107,6 @@ def test_hugetlbfs_snapshot(
115107
check_hugetlbfs_in_use(vm.firecracker_pid, "/anon_hugepage")
116108

117109

118-
@pytest.mark.skipif(
119-
global_props.host_linux_version == "4.14",
120-
reason="MFD_HUGETLB | MFD_ALLOW_SEALING only supported on kernels >= 4.16",
121-
)
122110
def test_hugetlbfs_diff_snapshot(microvm_factory, uvm_plain, uffd_handler_paths):
123111
"""
124112
Test hugetlbfs differential snapshot support.
@@ -166,10 +154,6 @@ def test_hugetlbfs_diff_snapshot(microvm_factory, uvm_plain, uffd_handler_paths)
166154
vm.wait_for_up()
167155

168156

169-
@pytest.mark.skipif(
170-
global_props.host_linux_version == "4.14",
171-
reason="MFD_HUGETLB | MFD_ALLOW_SEALING only supported on kernels >= 4.16",
172-
)
173157
@pytest.mark.parametrize("huge_pages", HugePagesConfig)
174158
def test_ept_violation_count(
175159
microvm_factory,
@@ -256,10 +240,6 @@ def test_ept_violation_count(
256240
metrics.put_metric(metric, int(metric_value), "Count")
257241

258242

259-
@pytest.mark.skipif(
260-
global_props.host_linux_version == "4.14",
261-
reason="MFD_HUGETLB | MFD_ALLOW_SEALING only supported on kernels >= 4.16",
262-
)
263243
def test_negative_huge_pages_plus_balloon(uvm_plain):
264244
"""Tests that huge pages and memory ballooning cannot be used together"""
265245
uvm_plain.memory_monitor = None
@@ -283,10 +263,6 @@ def test_negative_huge_pages_plus_balloon(uvm_plain):
283263
uvm_plain.basic_config(huge_pages=HugePagesConfig.HUGETLBFS_2MB)
284264

285265

286-
@pytest.mark.skipif(
287-
global_props.host_linux_version == "4.14",
288-
reason="MFD_HUGETLB | MFD_ALLOW_SEALING only supported on kernels >= 4.16",
289-
)
290266
def test_negative_huge_pages_plus_initrd(uvm_with_initrd):
291267
"""Tests that huge pages and initrd cannot be used together"""
292268
uvm_with_initrd.jailer.daemonize = False

tools/devtool

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ apply_performance_tweaks() {
605605
# https://www.kernel.org/doc/html/v4.12/admin-guide/pm/intel_pstate.html
606606
echo 100 |sudo tee /sys/devices/system/cpu/intel_pstate/min_perf_pct &> /dev/null
607607
echo 100 |sudo tee /sys/devices/system/cpu/intel_pstate/max_perf_pct &> /dev/null
608-
elif [[ -f /sys/devices/system/cpu/cpufreq/boost ]] && [ ! $(uname -r | grep 4.14) ]; then
608+
elif [[ -f /sys/devices/system/cpu/cpufreq/boost ]]; then
609609
echo 0 |sudo tee /sys/devices/system/cpu/cpufreq/boost &> /dev/null
610610
fi
611611

0 commit comments

Comments
 (0)