kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update reference kernel to 'v6.12.8-20250613'

Browse Source 
This bump also includes another release 'ch-release-v6.12.8-20250422'
that changed the naming convention of the released kernel binaries
[1]. As a result, few changes are made to our integration tests and test
scripts.

[1] https://github.com/cloud-hypervisor/linux/releases/tag/ch-release-v6.12.8-20250422

Signed-off-by: Bo Chen <bchen@crusoe.ai>
This commit is contained in:
Bo Chen
2025-06-13 22:00:44 +00:00
parent 80f4bfac00
commit 2b05753716
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/run_integration_tests_aarch64.sh
View File

@@ -137,7 +137,7 @@ update_workloads() {
mkdir -p "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR" mkdir -p "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR"
# Mount the 'raw' image, replace the compressed kernel file and umount the working folder # Mount the 'raw' image, replace the compressed kernel file and umount the working folder
guestmount -a "$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_NAME" -m /dev/sda1 "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR" || exit 1 guestmount -a "$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_NAME" -m /dev/sda1 "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR" || exit 1
cp "$WORKLOADS_DIR"/Image.gz "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR"/boot/vmlinuz cp "$WORKLOADS_DIR"/Image-arm64.gz "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR"/boot/vmlinuz
guestunmount "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR" guestunmount "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR"
# Build virtiofsd # Build virtiofsd

2
scripts/run_integration_tests_live_migration.sh
View File

@@ -54,7 +54,7 @@ chmod +x $CH_RELEASE_NAME
popd || exit popd || exit
# Build custom kernel based on virtio-pmem and virtio-fs upstream patches # Build custom kernel based on virtio-pmem and virtio-fs upstream patches
VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux" VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux-x86_64"
if [ ! -f "$VMLINUX_IMAGE" ]; then if [ ! -f "$VMLINUX_IMAGE" ]; then
# Prepare linux image (build from source or download pre-built) # Prepare linux image (build from source or download pre-built)
prepare_linux prepare_linux

2
scripts/run_integration_tests_x86_64.sh
View File

@@ -100,7 +100,7 @@ fi
popd || exit popd || exit
# Build custom kernel based on virtio-pmem and virtio-fs upstream patches # Build custom kernel based on virtio-pmem and virtio-fs upstream patches
VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux" VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux-x86_64"
if [ ! -f "$VMLINUX_IMAGE" ]; then if [ ! -f "$VMLINUX_IMAGE" ]; then
# Prepare linux image (build from source or download pre-built) # Prepare linux image (build from source or download pre-built)
prepare_linux prepare_linux

12
scripts/test-util.sh
View File

@@ -1,4 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -x
hypervisor="kvm" hypervisor="kvm"
test_filter="" test_filter=""
build_kernel=false build_kernel=false
@@ -56,11 +58,11 @@ build_custom_linux() {
make ch_defconfig make ch_defconfig
make -j "$(nproc)" make -j "$(nproc)"
if [ "${ARCH}" == "x86_64" ]; then if [ "${ARCH}" == "x86_64" ]; then
cp vmlinux "$WORKLOADS_DIR/" || exit 1 cp vmlinux "$WORKLOADS_DIR/vmlinux-x86_64" || exit 1
cp arch/x86/boot/bzImage "$WORKLOADS_DIR/" || exit 1 cp arch/x86/boot/bzImage "$WORKLOADS_DIR/bzImage-x86_64" || exit 1
elif [ "${ARCH}" == "aarch64" ]; then elif [ "${ARCH}" == "aarch64" ]; then
cp arch/arm64/boot/Image "$WORKLOADS_DIR/" || exit 1 cp arch/arm64/boot/Image "$WORKLOADS_DIR/Image-arm64" || exit 1
cp arch/arm64/boot/Image.gz "$WORKLOADS_DIR/" || exit 1 cp arch/arm64/boot/Image.gz "$WORKLOADS_DIR/Image-arm64.gz" || exit 1
fi fi
popd || exit popd || exit
} }
@@ -138,7 +140,7 @@ download_hypervisor_fw() {
} }
download_linux() { download_linux() {
KERNEL_TAG="ch-release-v6.12.8-20250114" KERNEL_TAG="ch-release-v6.12.8-20250613"
if [ -n "$AUTH_DOWNLOAD_TOKEN" ]; then if [ -n "$AUTH_DOWNLOAD_TOKEN" ]; then
echo "Using authenticated download from GitHub" echo "Using authenticated download from GitHub"
KERNEL_URLS=$(curl --silent https://api.github.com/repos/cloud-hypervisor/linux/releases/tags/${KERNEL_TAG} \ KERNEL_URLS=$(curl --silent https://api.github.com/repos/cloud-hypervisor/linux/releases/tags/${KERNEL_TAG} \

2
test_data/cloud-init/ubuntu/ci/user-data
View File

@@ -47,7 +47,7 @@ write_files:
# 1G ram requires 512 pages # 1G ram requires 512 pages
echo 512 | sudo tee /proc/sys/vm/nr_hugepages echo 512 | sudo tee /proc/sys/vm/nr_hugepages
sudo chmod a+rwX /dev/hugepages sudo chmod a+rwX /dev/hugepages
/mnt/cloud-hypervisor --kernel /mnt/vmlinux --cmdline "console=hvc0 reboot=k panic=1 nomodules root=/dev/vda1 VFIOTAG" --disk path=/mnt/focal-server-cloudimg-amd64-custom-20210609-0.raw path=/mnt/cloudinit.img --cpus boot=1 --memory size=512M,hotplug_size=1G,hugepages=on --device path=/sys/bus/pci/devices/0000:00:05.0/ path=/sys/bus/pci/devices/0000:00:07.0/ path=/sys/bus/pci/devices/0000:00:08.0/ --api-socket=/tmp/ch_api.sock /mnt/cloud-hypervisor --kernel /mnt/vmlinux-x86_64 --cmdline "console=hvc0 reboot=k panic=1 nomodules root=/dev/vda1 VFIOTAG" --disk path=/mnt/focal-server-cloudimg-amd64-custom-20210609-0.raw path=/mnt/cloudinit.img --cpus boot=1 --memory size=512M,hotplug_size=1G,hugepages=on --device path=/sys/bus/pci/devices/0000:00:05.0/ path=/sys/bus/pci/devices/0000:00:07.0/ path=/sys/bus/pci/devices/0000:00:08.0/ --api-socket=/tmp/ch_api.sock
- -
path: /etc/systemd/system/notify-booted.service path: /etc/systemd/system/notify-booted.service

8
tests/integration.rs
View File

@@ -533,9 +533,9 @@ fn direct_kernel_boot_path() -> PathBuf {
let mut kernel_path = workload_path; let mut kernel_path = workload_path;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
kernel_path.push("vmlinux"); kernel_path.push("vmlinux-x86_64");
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
kernel_path.push("Image"); kernel_path.push("Image-arm64");
kernel_path kernel_path
} }
@@ -3180,7 +3180,7 @@ mod common_parallel {
let mut kernel_path = direct_kernel_boot_path(); let mut kernel_path = direct_kernel_boot_path();
// Replace the default kernel with the bzImage. // Replace the default kernel with the bzImage.
kernel_path.pop(); kernel_path.pop();
kernel_path.push("bzImage"); kernel_path.push("bzImage-x86_64");
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(["--cpus", "boot=1"]) .args(["--cpus", "boot=1"])
@@ -6045,7 +6045,7 @@ mod common_parallel {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
{ {
let mut pvh_kernel_path = workload_path.clone(); let mut pvh_kernel_path = workload_path.clone();
pvh_kernel_path.push("vmlinux"); pvh_kernel_path.push("vmlinux-x86_64");
kernels.push(pvh_kernel_path); kernels.push(pvh_kernel_path);
} }