diff options
| author | Kristian Klausen <kristian@klausen.dk> | 2024-05-06 22:33:36 +0200 |
|---|---|---|
| committer | Kristian Klausen <kristian@klausen.dk> | 2024-05-06 22:34:06 +0200 |
| commit | c77872be2674bf87a8d76306f0621c76f8a08279 (patch) | |
| tree | 29ec55e4d7f8ab2286e67d9f74e47284ad747894 | |
| parent | 9c176e628480dd44b13742fc1f9bacb1b8c1bf25 (diff) | |
| parent | 7c4d73afd5968dc58777f99dc0ee8b125c5ab96e (diff) | |
Merge branch 'OVMF_CODE.4m.fd' into 'master'
.gitlab-ci.yml: use 4 MiB OVMF files
See merge request archlinux/arch-boxes!199
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files 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" |