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]>
firecracker-microvm · Aug 16, 2024 · 109bd54 · 109bd54
1 parent 539316f
commit 109bd54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -365,7 +365,7 @@ def rootfs_fxt(request, record_property):
     guest_kernel_fxt, params=kernel_params("vmlinux-5.10.219")
 )
 guest_kernel_linux_6_5 = pytest.fixture(
-    guest_kernel_fxt, params=kernel_params("vmlinux-6.5.*", select=kernels_unfiltered)
+    guest_kernel_fxt, params=kernel_params("vmlinux-6.5.13", select=kernels_unfiltered)
 )
 # Use the unfiltered selector, since we don't officially support 6.1 yet.
 # TODO: switch to default selector once we add full 6.1 support.

diff --git a/tests/integration_tests/performance/test_vcpu_hotplug.py b/tests/integration_tests/performance/test_vcpu_hotplug.py
@@ -26,13 +26,13 @@
     "vcpu_count", [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]
 )
 def test_custom_udev_rule_latency(
-    microvm_factory, guest_kernel_linux_6_1, rootfs_rw, vcpu_count, results_dir
+    microvm_factory, guest_kernel_linux_6_5, rootfs_rw, vcpu_count, results_dir
 ):
     """Test the latency for hotplugging and booting CPUs in the guest"""
     gcc_compile(Path("./host_tools/hotplug_time.c"), Path("host_tools/hotplug_time.o"))
     data = []
     for _ in range(20):
-        uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_1, rootfs_rw)
+        uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_5, rootfs_rw)
         uvm_hotplug.jailer.extra_args.update({"boot-timer": None, "no-seccomp": None})
         uvm_hotplug.help.enable_console()
         uvm_hotplug.spawn()
@@ -111,13 +111,13 @@ def test_custom_udev_rule_latency(
     "vcpu_count", [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]
 )
 def test_manual_latency(
-    microvm_factory, guest_kernel_linux_6_1, rootfs_rw, vcpu_count, results_dir
+    microvm_factory, guest_kernel_linux_6_5, rootfs_rw, vcpu_count, results_dir
 ):
     """Test the latency for hotplugging and booting CPUs in the guest"""
     gcc_compile(Path("./host_tools/hotplug_time.c"), Path("host_tools/hotplug_time.o"))
     data = []
     for _ in range(20):
-        uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_1, rootfs_rw)
+        uvm_hotplug = microvm_factory.build(guest_kernel_linux_6_5, rootfs_rw)
         uvm_hotplug.jailer.extra_args.update({"boot-timer": None, "no-seccomp": None})
         uvm_hotplug.help.enable_console()
         uvm_hotplug.spawn()

diff --git a/tools/devtool b/tools/devtool
@@ -525,7 +525,7 @@ ensure_ci_artifacts() {
 
     # Fetch all the artifacts so they are local
     say "Fetching CI artifacts from S3"
-    S3_URL=s3://spec.ccfc.min/firecracker-ci/v1.9/$(uname -m)
+    S3_URL=s3://spec.ccfc.min/firecracker-ci/v1.9-for-jxcurtis/$(uname -m)
     ARTIFACTS=$MICROVM_IMAGES_DIR/$(uname -m)
     if [ ! -d "$ARTIFACTS" ]; then
         mkdir -pv $ARTIFACTS