From 8a7abcebf8139c8bb6b47d44ade99f13e0c24f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Wed, 30 Jul 2025 18:36:09 +0200 Subject: [PATCH] ci.ocp: Allow to set/provide PP_IMAGE_ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to be able to test with older or custom peer-pod image. Signed-off-by: Lukáš Doktor --- ci/openshift-ci/peer-pods-azure.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/openshift-ci/peer-pods-azure.sh b/ci/openshift-ci/peer-pods-azure.sh index 957c01f0df..08a48d7de1 100755 --- a/ci/openshift-ci/peer-pods-azure.sh +++ b/ci/openshift-ci/peer-pods-azure.sh @@ -124,11 +124,13 @@ if [[ -z "${CAA_TAG}" ]]; then fi # Get latest PP image -SUCCESS_TIME=$(curl -s \ - -H "Accept: application/vnd.github+json" \ - "https://api.github.com/repos/confidential-containers/cloud-api-adaptor/actions/workflows/azure-nightly-build.yml/runs?status=success" \ - | jq -r '.workflow_runs[0].updated_at') -PP_IMAGE_ID="/CommunityGalleries/cocopodvm-d0e4f35f-5530-4b9c-8596-112487cdea85/Images/podvm_image0/Versions/$(date -u -jf "%Y-%m-%dT%H:%M:%SZ" "${SUCCESS_TIME}" "+%Y.%m.%d" 2>/dev/null || date -d "${SUCCESS_TIME}" +%Y.%m.%d)" +if [[ -z "${PP_IMAGE_ID}" ]]; then + SUCCESS_TIME=$(curl -s \ + -H "Accept: application/vnd.github+json" \ + "https://api.github.com/repos/confidential-containers/cloud-api-adaptor/actions/workflows/azure-nightly-build.yml/runs?status=success" \ + | jq -r '.workflow_runs[0].updated_at') + PP_IMAGE_ID="/CommunityGalleries/cocopodvm-d0e4f35f-5530-4b9c-8596-112487cdea85/Images/podvm_image0/Versions/$(date -u -jf "%Y-%m-%dT%H:%M:%SZ" "${SUCCESS_TIME}" "+%Y.%m.%d" 2>/dev/null || date -d "${SUCCESS_TIME}" +%Y.%m.%d)" +fi echo "AZURE_REGION=\"${AZURE_REGION}\"" echo "PP_REGION=\"${PP_REGION}\""