From f4a948a35ce1d65b1cfdb1bc8c330dd3c0e2f3c1 Mon Sep 17 00:00:00 2001 From: Jack Thomson Date: Fri, 28 Mar 2025 10:40:47 +0000 Subject: [PATCH 1/2] test: Skip final huge page tests We previously skipped a huge page test which stoppped the test timing out, but now we get stuck on another. Skipping this and the other huge page snapshot tests in the file. Signed-off-by: Jack Thomson --- .../performance/test_snapshot_ab.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/integration_tests/performance/test_snapshot_ab.py b/tests/integration_tests/performance/test_snapshot_ab.py index e8a24a43b50..fb8d7eee880 100644 --- a/tests/integration_tests/performance/test_snapshot_ab.py +++ b/tests/integration_tests/performance/test_snapshot_ab.py @@ -1,6 +1,7 @@ # Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 """Performance benchmark for snapshot restore.""" + import re import signal import tempfile @@ -106,6 +107,15 @@ def test_restore_latency( We only test a single guest kernel, as the guest kernel does not "participate" in snapshot restore. """ + if ( + test_setup.huge_pages != HugePagesConfig.NONE + and global_props.host_linux_version_tpl > (6, 1) + and global_props.cpu_architecture == "aarch64" + ): + pytest.skip( + "huge pages with secret hiding kernels on ARM are currently failing" + ) + vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs) metrics.set_dimensions( @@ -218,6 +228,15 @@ def test_population_latency( mem, ): """Collects population latency metrics (e.g. how long it takes UFFD handler to fault in all memory)""" + if ( + huge_pages != HugePagesConfig.NONE + and global_props.host_linux_version_tpl > (6, 1) + and global_props.cpu_architecture == "aarch64" + ): + pytest.skip( + "huge pages with secret hiding kernels on ARM are currently failing" + ) + test_setup = SnapshotRestoreTest(mem=mem, vcpus=vcpus, huge_pages=huge_pages) vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs) From 83038c681992764bf46ac6cc40146a9e9a9599bf Mon Sep 17 00:00:00 2001 From: Jack Thomson Date: Mon, 31 Mar 2025 09:31:46 +0000 Subject: [PATCH 2/2] tests(bk): Run the kernel build in our nightly PR Run the kernel build as part of our nightly tests so we can monitor it's success. Signed-off-by: Jack Thomson --- .buildkite/pipeline_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline_pr.py b/.buildkite/pipeline_pr.py index f5818f8bd02..be77a3fafd0 100755 --- a/.buildkite/pipeline_pr.py +++ b/.buildkite/pipeline_pr.py @@ -68,7 +68,7 @@ for step in kani_grp["steps"]: step["label"] = "🔍 Kani" -if any(x.parent.name == "hiding_ci" for x in changed_files): +if not changed_files or (any(x.parent.name == "hiding_ci" for x in changed_files)): pipeline.build_group_per_arch( "🕵️ Build Secret Hiding Kernel", pipeline.devtool_test(