Skip to content

Commit 2546170

Browse files
zulinx86pb8o
authored andcommitted
test: Make test_guest_cpu_config_change optional
[ Upstream commit 554635c ] This test compares the baseline guest_cpu_config gathered in the past with the current one and fails potentially due to firecracker's code changes or kernel/microcode updates. To be aware correctly that CPU config has been changed by firecracker, the test was set as a mandatory requirement to merge PRs. However, since the introduction of the test (commit 8161c0b ("test(tool): verify CPU config has not changed") on 2023 Apr 5, the following CPU config changes have been caused by non-firecracker changes: - The RRSBA bit of IA32_ARCH_CAPABILITIES MSR flipped from 0 to 1 on Intel Cascade Lake. - The GDS_CTRL bit of IA32_ARCH_CAPABILITIES MSR flipped from 0 to 1 on combinations of (Intel Skylake, Intel Cascade Lake, Intel Ice Lake) x (host kernel 4.14). Although this kind of CPU config changes should be investigated and handled appropriately, it blocks all PRs and we cannot merge any PRs until it is fixed. So this commit makes the test optional. Signed-off-by: Takahiro Itazuri <[email protected]>
1 parent 103f7e3 commit 2546170

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

tests/integration_tests/functional/test_cpu_template_helper.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ def test_cpu_config_dump_vs_actual(
320320
), f"Mismatched MSR for {key:#010x}: {actual=:#066b} vs. {dump=:#066b}"
321321

322322

323+
@pytest.mark.nonci
323324
@pytest.mark.skipif(
324325
utils.get_kernel_version(level=1) not in SUPPORTED_HOST_KERNELS,
325326
reason=f"Supported kernels are {SUPPORTED_HOST_KERNELS}",

0 commit comments

Comments
 (0)