Skip to content

Commit 109bd54

Browse files
committed
Change CI artifacts s3 address to allow building for 6.5 kernel
6.5 kernel has Kconfig option for parallel CPU onlining, so gathering data around that. Signed-off-by: James Curtis <[email protected]>
1 parent 539316f commit 109bd54

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tests/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def rootfs_fxt(request, record_property):
365365
guest_kernel_fxt, params=kernel_params("vmlinux-5.10.219")
366366
)
367367
guest_kernel_linux_6_5 = pytest.fixture(
368-
guest_kernel_fxt, params=kernel_params("vmlinux-6.5.*", select=kernels_unfiltered)
368+
guest_kernel_fxt, params=kernel_params("vmlinux-6.5.13", select=kernels_unfiltered)
369369
)
370370
# Use the unfiltered selector, since we don't officially support 6.1 yet.
371371
# TODO: switch to default selector once we add full 6.1 support.

tests/integration_tests/performance/test_vcpu_hotplug.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
"vcpu_count", [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]
2727
)
2828
def test_custom_udev_rule_latency(
29-
microvm_factory, guest_kernel_linux_6_1, rootfs_rw, vcpu_count, results_dir
29+
microvm_factory, guest_kernel_linux_6_5, rootfs_rw, vcpu_count, results_dir
3030
):
3131
"""Test the latency for hotplugging and booting CPUs in the guest"""
3232
gcc_compile(Path("./host_tools/hotplug_time.c"), Path("host_tools/hotplug_time.o"))
3333
data = []
3434
for _ in range(20):
35-
uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_1, rootfs_rw)
35+
uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_5, rootfs_rw)
3636
uvm_hotplug.jailer.extra_args.update({"boot-timer": None, "no-seccomp": None})
3737
uvm_hotplug.help.enable_console()
3838
uvm_hotplug.spawn()
@@ -111,13 +111,13 @@ def test_custom_udev_rule_latency(
111111
"vcpu_count", [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]
112112
)
113113
def test_manual_latency(
114-
microvm_factory, guest_kernel_linux_6_1, rootfs_rw, vcpu_count, results_dir
114+
microvm_factory, guest_kernel_linux_6_5, rootfs_rw, vcpu_count, results_dir
115115
):
116116
"""Test the latency for hotplugging and booting CPUs in the guest"""
117117
gcc_compile(Path("./host_tools/hotplug_time.c"), Path("host_tools/hotplug_time.o"))
118118
data = []
119119
for _ in range(20):
120-
uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_1, rootfs_rw)
120+
uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_5, rootfs_rw)
121121
uvm_hotplug.jailer.extra_args.update({"boot-timer": None, "no-seccomp": None})
122122
uvm_hotplug.help.enable_console()
123123
uvm_hotplug.spawn()

tools/devtool

+1-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ ensure_ci_artifacts() {
525525

526526
# Fetch all the artifacts so they are local
527527
say "Fetching CI artifacts from S3"
528-
S3_URL=s3://spec.ccfc.min/firecracker-ci/v1.9/$(uname -m)
528+
S3_URL=s3://spec.ccfc.min/firecracker-ci/v1.9-for-jxcurtis/$(uname -m)
529529
ARTIFACTS=$MICROVM_IMAGES_DIR/$(uname -m)
530530
if [ ! -d "$ARTIFACTS" ]; then
531531
mkdir -pv $ARTIFACTS

0 commit comments

Comments
 (0)