Revert "gitlab_runner: Initial the keyring in the base image for faster boot"

This reverts commit 466230e4.

This has been fixed in pacman[1], so it is no longer unreasonably slow.
Some quick testing at runner1 indicates that this only saves five
seconds at best, so IMO it is not worth the complexity to continue doing
this.

This revert does not revert the timeout back to 60 seconds, but keeps it
at 30 seconds.

[1] pacman/pacman!16

roles/gitlab_runner/files/libvirt-executor-update-base-image

@@ -30,9 +30,7 @@ qemu-img convert -f qcow2 -O raw Arch-Linux-x86_64-basic.qcow2 Arch-Linux-x86_64
 
 loopdev="$(losetup --find --partscan --show "${image}")"
 mount --mkdir "${loopdev}p3" mnt
-
-arch-chroot mnt pacman-key --init
-arch-chroot mnt pacman-key --populate
+mount --mkdir --bind -o ro /etc/pacman.d/gnupg mnt/etc/pacman.d/gnupg
 
 arch-chroot mnt systemctl disable systemd-time-wait-sync
 arch-chroot mnt pacman -Sy --noconfirm --needed archlinux-keyring
@@ -47,8 +45,8 @@ rm -f mnt/etc/machine-id mnt/etc/hostname
 
 cp -a mnt/boot/{initramfs-linux-fallback.img,initramfs-linux.img}
 
-rm -r mnt/etc/pacman.d/gnupg/{openpgp-revocs.d,private-keys-v1.d}/
-arch-chroot mnt pacman-key --delete pacman@localhost
+umount mnt/etc/pacman.d/gnupg
+rmdir mnt/etc/pacman.d/gnupg
 umount mnt
 losetup -d "${loopdev}"
 loopdev=""