From 05f13b2b82d8ce255202631cee193bc98d9807ab Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 31 Jan 2024 10:47:11 +0100 Subject: [PATCH] ci: CentOS CI networking is stable again, remove pull-loop The for loop in Groovy does not work, but fortunately it seems that the CentOS CI network environment is stable again. Pulling container images is working as it did before. Signed-off-by: Niels de Vos --- k8s-e2e-external-storage.groovy | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/k8s-e2e-external-storage.groovy b/k8s-e2e-external-storage.groovy index 0b3696c99..b31101fde 100644 --- a/k8s-e2e-external-storage.groovy +++ b/k8s-e2e-external-storage.groovy @@ -38,28 +38,8 @@ def create_duffy_config() { // pulling from the destination registry. // // Images need to be pre-pushed into the source registry, though. -// -// On occasion pulling images is not stable due to a broken proxy in the CI -// environment. For that, try pulling the image up to 10x. def podman_pull(source, destination, image) { - def failed = null - - for (int i in 0..9) { - try { - ssh "podman pull --authfile=~/.podman-auth.json ${source}/${image} && podman tag ${source}/${image} ${image} ${destination}/${image}" - failed = null - break - } - catch (err) { - failed = err - // failed to pull image, but try again - } - } - - // if the last pull failed, throw the error - if (failed != null) { - throw failed - } + ssh "podman pull --authfile=~/.podman-auth.json ${source}/${image} && podman tag ${source}/${image} ${image} ${destination}/${image}" } node('cico-workspace') {