Skip to content

Tidyup on Hiding CI #5120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Tidyup on Hiding CI #5120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7ea840
tests: Skip more huge page tests on ARM
JackThomson2 Mar 27, 2025
238eb8e
ci: Move away from using dir stacks
JackThomson2 Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions resources/hiding_ci/build_and_install_kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ check_ubuntu() {
tidy_up() {
# Some cleanup after we are done
echo "Cleaning up.."
popd
cd $START_DIR
rm -rf $TMP_BUILD_DIR
}

Expand Down Expand Up @@ -103,7 +103,8 @@ KERNEL_CONFIG_OVERRIDES=$(pwd)/kernel_config_overrides

TMP_BUILD_DIR=$(mktemp -d -t kernel-build-XXXX)

pushd .
START_DIR=$(pwd)

cd $TMP_BUILD_DIR

echo "Cloning kernel repository into" $TMP_BUILD_DIR
Expand Down
10 changes: 10 additions & 0 deletions tests/integration_tests/performance/test_snapshot_ab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import host_tools.drive as drive_tools
from framework.microvm import HugePagesConfig, Microvm
from framework.properties import global_props

USEC_IN_MSEC = 1000
NS_IN_MSEC = 1_000_000
Expand Down Expand Up @@ -153,6 +154,15 @@ def test_post_restore_latency(
if huge_pages != HugePagesConfig.NONE and uffd_handler is None:
pytest.skip("huge page snapshots can only be restored using uffd")

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=1024, vcpus=2, huge_pages=huge_pages)
vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs)

Expand Down