From 0aae39d73a09eb32adc621acbbc98ac6f86b4ad1 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Fri, 29 Jul 2022 23:27:55 +0200 Subject: [PATCH] test: Expand root partition of Debian sid amd64 and aarch64 images A couple of days ago, we started running out of space there as we're about to install gcc -- about 50 MiB are missing. Given that virt-resize (which could be conveniently invoked by the Makefile for tests) reorders partitions if we expand the first one, resize the image using qemu-img from the test script itself, and then take care of expanding root partition and filesystem online later. This is probably a temporary hack, so I'm not looking for a more generic or elegant solution at the moment. Signed-off-by: Stefano Brivio --- test/distro/debian | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/distro/debian b/test/distro/debian index abbbaa2..1548761 100644 --- a/test/distro/debian +++ b/test/distro/debian @@ -184,10 +184,19 @@ sleep 1 hostb reset +# HACK: We need some additional space to install gcc-12 on 'sid' images for +# amd64 and aarch64, but if we use virt-resize to call resize2fs in the +# preparation step, partitions will be rearranged and we would also need to +# adjust boot parameters. Instead, resize the images offline first, and expand +# partitions and filesystems online, later. + test Debian GNU/Linux sid (experimental), amd64 +host qemu-img resize __BASEPATH__/prepared-debian-sid-nocloud-amd64-daily.qcow2 4G host ./qrap 5 qemu-system-x86_64 -M pc,accel=kvm:tcg -m 1024 -nographic -serial stdio -nodefaults -no-reboot -nographic -vga none __BASEPATH__/prepared-debian-sid-nocloud-amd64-daily.qcow2 -net socket,fd=5 -net nic,model=virtio -snapshot sleep 2 +host growpart /dev/sda 1 +host resize2fs -p /dev/sda1 host apt-get update host apt-get -y install make gcc netcat-openbsd @@ -202,8 +211,11 @@ sleep 1 test Debian GNU/Linux sid (experimental), aarch64 +host qemu-img resize __BASEPATH__/prepared-debian-sid-nocloud-arm64-daily.qcow2 4G host ./qrap 5 qemu-system-aarch64 -m 2048 -cpu cortex-a57 -smp 2 -M virt -bios __BASEPATH__/QEMU_EFI.fd -nographic -serial stdio -nodefaults -no-reboot -nographic -vga none __BASEPATH__/prepared-debian-sid-nocloud-arm64-daily.qcow2 -net socket,fd=5 -net nic,model=virtio -snapshot sleep 2 +host growpart /dev/vda 1 +host resize2fs -p /dev/vda1 host apt-get update host apt-get -y install make gcc netcat-openbsd