diff options
| author | Kristian Klausen <kristian@klausen.dk> | 2023-08-26 00:38:46 +0200 |
|---|---|---|
| committer | Kristian Klausen <kristian@klausen.dk> | 2023-08-26 01:07:05 +0200 |
| commit | d9805786ef1055654255d0f371d8194a06e8b0d3 (patch) | |
| tree | 4f00d086328c26d46a8323184cc4dc82bd3e97ba | |
| parent | bfda5e7f081736713a0d421861309d4b0162b8a7 (diff) | |
Replace qemu-headless with the new qemu-base package[1]
The refactor of the qemu package was done over a year ago[1], but the
qemu-headless "provides" has only recently been dropped[2][3].
For the .build job, only qemu-img is needed since [4].
[1] https://archlinux.org/news/qemu-700-changes-split-package-setup/
[2] https://gitlab.archlinux.org/archlinux/packaging/packages/qemu/-/commit/6b17907e83f69e873fa1495350bdaf70097142c0
[3] https://gitlab.archlinux.org/archlinux/packaging/packages/qemu/-/commit/dd39e979e6817ebe6c25ee9de1ed0e8c7d670538
[4] 3bda5b2 ("Use new experimental VM runners[1] for building")
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdd48d3..566326e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ shfmt: .build: stage: build before_script: - - pacman -Syu --needed --noconfirm gptfdisk btrfs-progs dosfstools arch-install-scripts qemu-headless jq + - pacman -Syu --needed --noconfirm gptfdisk btrfs-progs dosfstools arch-install-scripts qemu-img jq script: - echo "BUILD_VERSION=$(date +%Y%m%d).$CI_JOB_ID" > build.env - export $(< build.env) @@ -85,7 +85,7 @@ test-basic-qemu-bios: variables: SSHPASS: arch before_script: - - pacman -Syu --needed --noconfirm qemu-headless sshpass + - pacman -Syu --needed --noconfirm qemu-base sshpass script: - 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 -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" @@ -97,7 +97,7 @@ test-cloudimg-qemu-bios: variables: SSHPASS: passw0rd before_script: - - pacman -Syu --needed --noconfirm qemu-headless cdrtools sshpass + - pacman -Syu --needed --noconfirm qemu-base cdrtools sshpass script: - | cat > user-data <<EOF @@ -132,7 +132,7 @@ test-basic-qemu-uefi-x64: variables: SSHPASS: arch before_script: - - pacman -Syu --needed --noconfirm qemu-headless edk2-ovmf sshpass + - 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 & @@ -145,7 +145,7 @@ test-cloudimg-qemu-uefi-x64: variables: SSHPASS: passw0rd before_script: - - pacman -Syu --needed --noconfirm qemu-headless edk2-ovmf cdrtools sshpass + - pacman -Syu --needed --noconfirm qemu-base edk2-ovmf cdrtools sshpass script: - | cat > user-data <<EOF |