From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 11 Aug 2022 09:32:21 +0000 (+0200)
Subject: semaphore: drop the --keyserver= parameter for the download template
X-Git-Tag: v252-rc1~470^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8162feac1017eeddf69049ef75abaa7a51043b23;p=thirdparty%2Fsystemd.git

semaphore: drop the --keyserver= parameter for the download template

since it's no longer supported/necessary.

See: https://github.com/lxc/lxc/commit/58520263041b6864cadad96278848f9b8ce78ee9
---

diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh
index ba218117181..a509473b170 100755
--- a/.semaphore/semaphore-runner.sh
+++ b/.semaphore/semaphore-runner.sh
@@ -19,14 +19,7 @@ PHASES=(${@:-SETUP RUN})
 UBUNTU_RELEASE="$(lsb_release -cs)"
 
 create_container() {
-    # Create autopkgtest LXC image; this sometimes fails with "Unable to fetch
-    # GPG key from keyserver", so retry a few times with different keyservers.
-    for keyserver in "keys.openpgp.org" "" "keyserver.ubuntu.com" "keys.gnupg.net"; do
-        for retry in {1..5}; do
-            sudo lxc-create -n "$CONTAINER" -t download -- -d "$DISTRO" -r "$RELEASE" -a "$ARCH" ${keyserver:+--keyserver "$keyserver"} && break 2
-            sleep $((retry*retry))
-        done
-    done
+    sudo lxc-create -n "$CONTAINER" -t download -- -d "$DISTRO" -r "$RELEASE" -a "$ARCH"
 
     # unconfine the container, otherwise some tests fail
     echo 'lxc.apparmor.profile = unconfined' | sudo tee -a "/var/lib/lxc/$CONTAINER/config"