From 1254b09838ae7f9e946e3ae28eea2a59c2304288 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Mon, 6 May 2024 17:04:32 +0300 Subject: .gitlab-ci.yml: use 4 MiB OVMF files Use `OVMF_CODE.4m.fd` and `OVMF_VARS.4m.fd` instead of the old 2 MiB `OVMF_CODE.fd` and `OVMF_VARS.fd`. --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 127c33a..5a05002 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,8 +134,8 @@ test-basic-qemu-uefi-x64: before_script: - pacman -Syu --needed --noconfirm qemu-base edk2-ovmf sshpass script: - - cp /usr/share/edk2-ovmf/x64/OVMF_VARS.fd ./ - - qemu-system-x86_64 -m 512 -net nic -net user,hostfwd=tcp::2222-:22 -drive file=$(ls output/Arch-Linux-x86_64-basic-*.qcow2),if=virtio -drive if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on -drive if=pflash,format=raw,unit=1,file=OVMF_VARS.fd -nographic & + - cp /usr/share/edk2/x64/OVMF_VARS.4m.fd ./ + - qemu-system-x86_64 -m 512 -net nic -net user,hostfwd=tcp::2222-:22 -drive file=$(ls output/Arch-Linux-x86_64-basic-*.qcow2),if=virtio -drive if=pflash,format=raw,unit=0,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd,read-only=on -drive if=pflash,format=raw,unit=1,file=OVMF_VARS.4m.fd -nographic & - timeout 15m sh -c "while ! sshpass -e ssh -o ConnectTimeout=2 -o StrictHostKeyChecking=no arch@localhost -p 2222 sudo true; do sleep 1; done" test-cloudimg-qemu-uefi-x64: @@ -168,8 +168,8 @@ test-cloudimg-qemu-uefi-x64: EOF - cat user-data meta-data - genisoimage -output seed.iso -volid cidata -joliet -rock user-data meta-data - - cp /usr/share/edk2-ovmf/x64/OVMF_VARS.fd ./ - - qemu-system-x86_64 -m 512 -net nic -net user,hostfwd=tcp::2222-:22 -drive file=$(ls output/Arch-Linux-x86_64-cloudimg-*.qcow2),if=virtio -drive file=seed.iso,if=virtio -drive if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on -drive if=pflash,format=raw,unit=1,file=OVMF_VARS.fd -nographic & + - cp /usr/share/edk2/x64/OVMF_VARS.4m.fd ./ + - qemu-system-x86_64 -m 512 -net nic -net user,hostfwd=tcp::2222-:22 -drive file=$(ls output/Arch-Linux-x86_64-cloudimg-*.qcow2),if=virtio -drive file=seed.iso,if=virtio -drive if=pflash,format=raw,unit=0,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd,read-only=on -drive if=pflash,format=raw,unit=1,file=OVMF_VARS.4m.fd -nographic & - timeout 15m sh -c "while ! sshpass -e ssh -o ConnectTimeout=2 -o StrictHostKeyChecking=no arch@localhost -p 2222 true; do sleep 1; done" - timeout 15m sh -c "while ! sshpass -e ssh -o ConnectTimeout=2 -o StrictHostKeyChecking=no arch@localhost -p 2222 pacman -Q bat tmux tree; do sleep 1; done" - timeout 15m sh -c "while ! sshpass -e ssh -o ConnectTimeout=2 -o StrictHostKeyChecking=no arch@localhost -p 2222 test -f /runcmd_successful ; do sleep 1; done" -- cgit v1.2.3-70-g09d2