Skip to content

Commit 5573725

Browse files
committed
ci: Add secret hiding kernel to defaults buildkite
Adding the secret hiding kernel as a default for the buildkite pipeline, this will mean that PR's made against the branch will now be run with the new secret hiding enabled amis. Some tests have been marked to skip as they are kernel dependent so while we are compiling our kernel in CI these could change again. Signed-off-by: Jack Thomson <[email protected]>
1 parent 4f766da commit 5573725

File tree

5 files changed

+44
-0
lines changed

5 files changed

+44
-0
lines changed

.buildkite/common.py

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
DEFAULT_PLATFORMS = [
2828
("al2", "linux_5.10"),
2929
("al2023", "linux_6.1"),
30+
("ubuntu24", "secret_hiding"),
3031
]
3132

3233

tests/integration_tests/functional/test_cpu_features_host_vs_guest.py

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
import os
1717

18+
import pytest
19+
1820
from framework import utils
1921
from framework.properties import global_props
2022
from framework.utils_cpuid import CPU_FEATURES_CMD, CpuModel
@@ -157,6 +159,10 @@
157159
}
158160

159161

162+
@pytest.mark.skipif(
163+
global_props.host_linux_version_tpl > (6, 1),
164+
reason="We don't currently track features for host kernels above 6.1.",
165+
)
160166
def test_host_vs_guest_cpu_features(uvm_plain_any):
161167
"""Check CPU features host vs guest"""
162168

tests/integration_tests/functional/test_shut_down.py

+6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@
44

55
import platform
66

7+
import pytest
78
from packaging import version
89

910
from framework import utils
11+
from framework.properties import global_props
1012

1113

14+
@pytest.mark.skipif(
15+
global_props.host_linux_version_tpl > (6, 1),
16+
reason="The number of threads associated to firecracker changes in newer kernels",
17+
)
1218
def test_reboot(uvm_plain_any):
1319
"""
1420
Test reboot from guest.

tests/integration_tests/performance/test_huge_pages.py

+25
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ 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_tpl > (6, 1)
60+
and global_props.cpu_architecture == "aarch64",
61+
reason="Huge page tests with secret hidden kernels on ARM currently fail",
62+
)
5863
def test_hugetlbfs_boot(uvm_plain):
5964
"""Tests booting a microvm with guest memory backed by 2MB hugetlbfs pages"""
6065

@@ -69,6 +74,11 @@ def test_hugetlbfs_boot(uvm_plain):
6974
)
7075

7176

77+
@pytest.mark.skipif(
78+
global_props.host_linux_version_tpl > (6, 1)
79+
and global_props.cpu_architecture == "aarch64",
80+
reason="Huge page tests with secret hidden kernels on ARM currently fail",
81+
)
7282
def test_hugetlbfs_snapshot(microvm_factory, guest_kernel_linux_5_10, rootfs):
7383
"""
7484
Test hugetlbfs snapshot restore via uffd
@@ -100,6 +110,11 @@ def test_hugetlbfs_snapshot(microvm_factory, guest_kernel_linux_5_10, rootfs):
100110
check_hugetlbfs_in_use(vm.firecracker_pid, "/anon_hugepage")
101111

102112

113+
@pytest.mark.skipif(
114+
global_props.host_linux_version_tpl > (6, 1)
115+
and global_props.cpu_architecture == "aarch64",
116+
reason="Huge page tests with secret hidden kernels on ARM currently fail",
117+
)
103118
def test_hugetlbfs_diff_snapshot(microvm_factory, uvm_plain):
104119
"""
105120
Test hugetlbfs differential snapshot support.
@@ -144,6 +159,11 @@ def test_hugetlbfs_diff_snapshot(microvm_factory, uvm_plain):
144159
# Verify if the restored microvm works.
145160

146161

162+
@pytest.mark.skipif(
163+
global_props.host_linux_version_tpl > (6, 1)
164+
and global_props.cpu_architecture == "aarch64",
165+
reason="Huge page tests with secret hidden kernels on ARM currently fail",
166+
)
147167
@pytest.mark.parametrize("huge_pages", HugePagesConfig)
148168
def test_ept_violation_count(
149169
microvm_factory,
@@ -225,6 +245,11 @@ def test_ept_violation_count(
225245
metrics.put_metric(metric, int(metric_value), "Count")
226246

227247

248+
@pytest.mark.skipif(
249+
global_props.host_linux_version_tpl > (6, 1)
250+
and global_props.cpu_architecture == "aarch64",
251+
reason="Huge page tests with secret hidden kernels on ARM currently fail",
252+
)
228253
def test_negative_huge_pages_plus_balloon(uvm_plain):
229254
"""Tests that huge pages and memory ballooning cannot be used together"""
230255
uvm_plain.memory_monitor = None

tests/integration_tests/performance/test_initrd.py

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import pytest
55

66
from framework.microvm import HugePagesConfig, Serial
7+
from framework.properties import global_props
78

89
INITRD_FILESYSTEM = "rootfs"
910

@@ -20,6 +21,11 @@ def uvm_with_initrd(microvm_factory, guest_kernel, record_property, artifact_dir
2021
yield uvm
2122

2223

24+
@pytest.mark.skipif(
25+
global_props.host_linux_version_tpl > (6, 1)
26+
and global_props.cpu_architecture == "aarch64",
27+
reason="Huge page tests with secret hidden kernels on ARM currently fail",
28+
)
2329
@pytest.mark.parametrize("huge_pages", HugePagesConfig)
2430
def test_microvm_initrd_with_serial(uvm_with_initrd, huge_pages):
2531
"""

0 commit comments

Comments
 (0)