From 272ff9c5688643975b27f9c723e538ae23ac9bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Fri, 19 Dec 2025 20:37:44 +0100 Subject: [PATCH 1/2] ci.ocp: Add notes about where to get other podvm images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I keep struggling finding the debug images, let's include them in the peer-pods-azure.sh script so people can find them easier. Co-Authored-By: Claude Opus 4.5 Signed-off-by: Lukáš Doktor --- ci/openshift-ci/peer-pods-azure.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ci/openshift-ci/peer-pods-azure.sh b/ci/openshift-ci/peer-pods-azure.sh index 588e4976f4..3f2f7ad34b 100755 --- a/ci/openshift-ci/peer-pods-azure.sh +++ b/ci/openshift-ci/peer-pods-azure.sh @@ -157,6 +157,16 @@ if [[ -z "${CAA_IMAGE}" ]]; then fi # Get latest PP image +# +# You can list the CI images by: +# az sig image-version list-community --location "eastus" --public-gallery-name "cocopodvm-d0e4f35f-5530-4b9c-8596-112487cdea85" --gallery-image-definition "podvm_image0" --output table +# or the release images by: +# az sig image-version list-community --location "eastus" --public-gallery-name "cococommunity-42d8482d-92cd-415b-b332-7648bd978eff" --gallery-image-definition "peerpod-podvm-fedora" --output table +# or the release debug images by: +# az sig image-version list-community --location "eastus" --public-gallery-name "cococommunity-42d8482d-92cd-415b-b332-7648bd978eff" --gallery-image-definition "peerpod-podvm-fedora-debug" --output table +# +# Note there are other flavours of the released images, you can list them by: +# az sig image-definition list-community --location "eastus" --public-gallery-name "cococommunity-42d8482d-92cd-415b-b332-7648bd978eff" --output table if [[ -z "${PP_IMAGE_ID}" ]]; then SUCCESS_TIME=$(curl -s \ -H "Accept: application/vnd.github+json" \ From 971b096a1fb8874bfceaf8ae92bfae7073ec609a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Fri, 19 Dec 2025 20:38:09 +0100 Subject: [PATCH 2/2] ci.ocp: Update cleanup.sh to cope with helm deployment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit replaces the old kata-deploy and uses "helm uninstall" instead. Signed-off-by: Lukáš Doktor --- ci/openshift-ci/cleanup.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ci/openshift-ci/cleanup.sh b/ci/openshift-ci/cleanup.sh index 36e359c10b..443b80b786 100755 --- a/ci/openshift-ci/cleanup.sh +++ b/ci/openshift-ci/cleanup.sh @@ -46,16 +46,12 @@ fi [[ ${SELINUX_PERMISSIVE} == "yes" ]] && oc delete -f "${deployments_dir}/machineconfig_selinux.yaml.in" # Delete kata-containers -pushd "${katacontainers_repo_dir}/tools/packaging/kata-deploy" || { echo "Failed to push to ${katacontainers_repo_dir}/tools/packaging/kata-deploy"; exit 125; } -oc delete -f kata-deploy/base/kata-deploy.yaml +helm uninstall kata-deploy --wait --namespace kube-system oc -n kube-system wait --timeout=10m --for=delete -l name=kata-deploy pod -oc apply -f kata-cleanup/base/kata-cleanup.yaml echo "Wait for all related pods to be gone" ( repeats=1; for _ in $(seq 1 600); do oc get pods -l name="kubelet-kata-cleanup" --no-headers=true -n kube-system 2>&1 | grep "No resources found" -q && ((repeats++)) || repeats=1 [[ "${repeats}" -gt 5 ]] && echo kata-cleanup finished && break sleep 1 done) || { echo "There are still some kata-cleanup related pods after 600 iterations"; oc get all -n kube-system; exit 1; } -oc delete -f kata-cleanup/base/kata-cleanup.yaml -oc delete -f kata-rbac/base/kata-rbac.yaml oc delete -f runtimeclasses/kata-runtimeClasses.yaml