From e9523b3ace55c556c79ebda9d7e5f42e361e4ef4 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 17 Nov 2020 13:52:32 +0100 Subject: [PATCH] ci: store podman-login results in ~/.podman-auth.json It seems that "podman pull" does not consume the authentication details from ~/.docker/config.json, so store the results of "podman login" in ~/.podman-auth.json and use the file for all "podman pull" commands. Signed-off-by: Niels de Vos --- mini-e2e.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mini-e2e.groovy b/mini-e2e.groovy index 6aac9d4e4..82a4987b9 100644 --- a/mini-e2e.groovy +++ b/mini-e2e.groovy @@ -102,13 +102,13 @@ node('cico-workspace') { ).trim() withCredentials([usernamePassword(credentialsId: 'container-registry-auth', usernameVariable: 'CREDS_USER', passwordVariable: 'CREDS_PASSWD')]) { - ssh "podman login --authfile=~/.docker/config.json --username=${CREDS_USER} --password='${CREDS_PASSWD}' ${ci_registry}" + ssh "podman login --authfile=~/.podman-auth.json --username=${CREDS_USER} --password='${CREDS_PASSWD}' ${ci_registry}" } // base_image is like ceph/ceph:v15 - ssh "podman pull ${ci_registry}/${base_image} && podman tag ${ci_registry}/${base_image} ${base_image}" + ssh "podman pull --authfile=~/.podman-auth.json ${ci_registry}/${base_image} && podman tag ${ci_registry}/${base_image} ${base_image}" // cephcsi:devel is used with 'make containerized-build' - ssh "podman pull ${ci_registry}/cephcsi:devel" + ssh "podman pull --authfile=~/.podman-auth.json ${ci_registry}/cephcsi:devel" } stage('build artifacts') { // build container image