From 23262bd8c472c0845393b41df6dd266ce3c12126 Mon Sep 17 00:00:00 2001
From: Ashwin Hendre <ashwin.hendre2@ibm.com>
Date: Mon, 23 Dec 2024 11:48:27 +0530
Subject: [PATCH] Switch to CentOS Stream 10

---
 build-containerd.sh | 12 +++++-------
 test.sh             | 15 +++++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build-containerd.sh b/build-containerd.sh
index e8a7ef5..5d7f6d6 100755
--- a/build-containerd.sh
+++ b/build-containerd.sh
@@ -54,25 +54,23 @@ buildContainerd() {
   mkdir /workspace/containerd-packaging-${DISTRO}
   cp -r /workspace/containerd-packaging-ref/* /workspace/containerd-packaging-${DISTRO}
   
-  if [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:8 ]]
-  then
+  if [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:8 ]]; then
     ##
     # Switch to quay.io for CentOS 8 stream
     # See https://github.com/docker/containerd-packaging/pull/263
     ##
     echo "Switching to CentOS 8 stream and using quay.io"
-
     TARGET="quay.io/centos/centos:stream8"
-
-  elif [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:9 ]]
-  then
+  elif [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:9 ]]; then
     ##
     # Switch to quay.io for CentOS 9 stream
     # See https://github.com/docker/containerd-packaging/pull/283
     ##
     echo "Switching to CentOS 9 stream and using quay.io"
-
     TARGET="quay.io/centos/centos:stream9"
+  elif [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:10 ]]; then
+     echo "Switching to CentOS 10 stream and using quay.io"
+     TARGET="quay.io/centos/centos:stream10"
   fi
 
   local MAKE_OPTS="REF=${CONTAINERD_TAG}"
diff --git a/test.sh b/test.sh
index 2e05e08..b278a64 100755
--- a/test.sh
+++ b/test.sh
@@ -125,8 +125,7 @@ BUILD_ARGS+=" --build-arg GO_VERSION=${GO_VERSION}"
 
   echo "### # Building the test image: ${IMAGE_NAME} # ###"
   # Building the test image
-  if [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:8 ]]
-  then
+  if [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:8 ]]; then
     ##
     # Switch to quay.io for CentOS 8 stream
     # See https://github.com/docker/containerd-packaging/pull/263
@@ -134,17 +133,21 @@ BUILD_ARGS+=" --build-arg GO_VERSION=${GO_VERSION}"
     ##
     echo "Temporary fix: patching Dockerfile for using CentOS 8 stream and quay.io "
     sed -i 's/FROM ppc64le.*/FROM quay.io\/centos\/centos\:stream8/g' Dockerfile
-
-  elif [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:9 ]]
-  then
+  elif [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:9 ]]; then
     ##
     # Switch to quay.io for CentOS 8 stream
     # See https://github.com/docker/containerd-packaging/pull/283
     ##
     echo "Temporary fix: patching Dockerfile for using CentOS 9 stream and quay.io "
     sed -i 's/FROM ppc64le.*/FROM quay.io\/centos\/centos\:stream9/g' Dockerfile
+  elif [[ "${DISTRO_NAME}:${DISTRO_VERS}" == centos:10 ]]; then
+    ##
+    # Switch to quay.io for CentOS 10 stream
+    ##
+    echo "Temporary fix: patching Dockerfile for using CentOS 10 stream and quay.io "
+    sed -i 's/FROM ppc64le.*/FROM quay.io\/centos\/centos\:stream10/g' Dockerfile
   fi
-
+ 
   BUILD_ARGS+=" --build-arg DISTRO_NAME=${DISTRO_NAME} --build-arg DISTRO_VERS=${DISTRO_VERS}"
 
   if [[ "$TEST_MODE" = "staging" || "$TEST_MODE" = "release"  ]]; then