From 9b4940f154d959ff5ef0352939f382f922471636 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Wed, 3 Aug 2022 17:26:41 +0200 Subject: [PATCH] ci: Make L1 guest use RAW image in test_vfio Rather than using the QCOW2 image, rely on the RAW one, the same way the host relies on this RAW image to boot the first VM. Signed-off-by: Sebastien Boeuf --- scripts/run_integration_tests_x86_64.sh | 2 +- test_data/cloud-init/ubuntu/user-data | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 0fb07866e..d181b29e1 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -166,7 +166,7 @@ VFIO_DIR="$WORKLOADS_DIR/vfio" VFIO_DISK_IMAGE="$WORKLOADS_DIR/vfio.img" rm -rf $VFIO_DIR $VFIO_DISK_IMAGE mkdir -p $VFIO_DIR -cp $FOCAL_OS_IMAGE $VFIO_DIR +cp $FOCAL_OS_RAW_IMAGE $VFIO_DIR cp $FW $VFIO_DIR cp $VMLINUX_IMAGE $VFIO_DIR || exit 1 diff --git a/test_data/cloud-init/ubuntu/user-data b/test_data/cloud-init/ubuntu/user-data index feacfe70e..b248fbed6 100644 --- a/test_data/cloud-init/ubuntu/user-data +++ b/test_data/cloud-init/ubuntu/user-data @@ -47,7 +47,7 @@ write_files: # 1G ram requires 512 pages echo 512 | sudo tee /proc/sys/vm/nr_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.qcow2 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 --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