From c25a4f9ffc4ac4693c8396944b2aa0d3155445f9 Mon Sep 17 00:00:00 2001 From: Andrea Panattoni Date: Wed, 26 Jun 2024 18:22:59 +0200 Subject: [PATCH 1/2] e2e: Stick to a stable OCP version Signed-off-by: Andrea Panattoni --- hack/run-e2e-conformance-virtual-ocp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/run-e2e-conformance-virtual-ocp.sh b/hack/run-e2e-conformance-virtual-ocp.sh index 5e80d3683..6f5d7d72f 100755 --- a/hack/run-e2e-conformance-virtual-ocp.sh +++ b/hack/run-e2e-conformance-virtual-ocp.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -xeo pipefail -OCP_VERSION=${OCP_VERSION:-4.16.0-rc.2} +OCP_VERSION=${OCP_VERSION:-4.16.0} cluster_name=${CLUSTER_NAME:-ocp-virt} domain_name=lab From 182fbfc01494cb90b884f6a98f08eb98767379d3 Mon Sep 17 00:00:00 2001 From: Andrea Panattoni Date: Mon, 8 Jul 2024 14:42:08 +0200 Subject: [PATCH 2/2] e2e: Fix the podman login to OCP internal registry In OCP 4.16, dockercfg secret moved from the form of "serviceaccount:xyz" to ":xyz". Use bash left trim operator (`${#}`) to make it explicit. Signed-off-by: Andrea Panattoni --- hack/run-e2e-conformance-virtual-ocp.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/run-e2e-conformance-virtual-ocp.sh b/hack/run-e2e-conformance-virtual-ocp.sh index 6f5d7d72f..e1bed50ce 100755 --- a/hack/run-e2e-conformance-virtual-ocp.sh +++ b/hack/run-e2e-conformance-virtual-ocp.sh @@ -237,7 +237,11 @@ echo ${auth} > registry-login.conf internal_registry="image-registry.openshift-image-registry.svc:5000" pass=$( jq .\"image-registry.openshift-image-registry.svc:5000\".auth registry-login.conf ) pass=`echo ${pass:1:-1} | base64 -d` -podman login -u serviceaccount -p ${pass:15} $registry --tls-verify=false + +# dockercfg password is in the form `:password`. We need to trim the `:` prefix +pass=${pass#":"} + +podman login -u serviceaccount -p ${pass} $registry --tls-verify=false MAX_RETRIES=20 DELAY_SECONDS=10