diff --git a/roles/gitlab_runner/files/libvirt-executor-update-base-image b/roles/gitlab_runner/files/libvirt-executor-update-base-image index 5e56a9ead571473cc92da11e70e32f55092502fb..87ce385e153992c4f23942d2ba491d5bfd41e582 100755 --- a/roles/gitlab_runner/files/libvirt-executor-update-base-image +++ b/roles/gitlab_runner/files/libvirt-executor-update-base-image @@ -23,9 +23,7 @@ trap cleanup EXIT cd "${tmpdir}" curl -sSf --remote-name-all https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-basic.qcow2{,.sig} -sq cert import "${arch_boxes_signing_key}" -sq pki link add --all "${arch_boxes_fingerprint}" -sq verify --signer-cert "${arch_boxes_fingerprint}" --detached Arch-Linux-x86_64-basic.qcow2.sig Arch-Linux-x86_64-basic.qcow2 +rsop verify Arch-Linux-x86_64-basic.qcow2.sig "${arch_boxes_signing_key}" < Arch-Linux-x86_64-basic.qcow2 image=Arch-Linux-x86_64-basic.img qemu-img convert -f qcow2 -O raw Arch-Linux-x86_64-basic.qcow2 Arch-Linux-x86_64-basic.img diff --git a/roles/gitlab_runner/tasks/main.yml b/roles/gitlab_runner/tasks/main.yml index cec94760f03a617cda54317801f79e40884e5988..08938213bc0eb2413bcc530f754e9e71640a8b40 100644 --- a/roles/gitlab_runner/tasks/main.yml +++ b/roles/gitlab_runner/tasks/main.yml @@ -67,7 +67,7 @@ when: "'gitlab_vm_runners' in group_names" block: - name: Install libvirt-executor-update-base-image dependencies - pacman: name=arch-install-scripts,sequoia-sq state=present + pacman: name=arch-install-scripts,rsop state=present - name: Create libvirt-executor configuration and data directories file: path={{ item }} state=directory owner=root group=root mode=0755