From 76c3264b911817bbf5c28fe892513213bfc4035e Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Wed, 18 Sep 2024 15:34:52 +0200
Subject: [PATCH] HDDS-11329. Update Ozone images to Rocky Linux-based runner

---
 hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh  |  4 ++--
 .../dist/src/main/compose/xcompat/clients.yaml         | 10 +++++-----
 .../dist/src/main/compose/xcompat/old-cluster.yaml     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh
index 69af73f50c9..d2718d04b7d 100755
--- a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh
@@ -51,12 +51,12 @@ create_data_dirs() {
 #    be used.
 ##   Else, a binary image will be used.
 prepare_for_image() {
-  local image_version="$1"
+  local image_version="${1}"
 
   if [[ "$image_version" = "$OZONE_CURRENT_VERSION" ]]; then
       prepare_for_runner_image
   else
-      prepare_for_binary_image "$image_version"
+      prepare_for_binary_image "${image_version}-rocky"
   fi
 }
 
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
index 0bf0f619bd7..4d6b7b0f999 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
@@ -16,35 +16,35 @@
 
 services:
   old_client_1_0_0:
-    image: apache/ozone:1.0.0
+    image: apache/ozone:1.0.0-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
     command: ["sleep","1000000"]
   old_client_1_1_0:
-    image: apache/ozone:1.1.0
+    image: apache/ozone:1.1.0-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
     command: ["sleep","1000000"]
   old_client_1_2_1:
-    image: apache/ozone:1.2.1
+    image: apache/ozone:1.2.1-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
     command: ["sleep","1000000"]
   old_client_1_3_0:
-    image: apache/ozone:1.3.0
+    image: apache/ozone:1.3.0-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
     command: ["sleep","1000000"]
   old_client_1_4_0:
-    image: apache/ozone:1.4.0
+    image: apache/ozone:1.4.0-rocky
     env_file:
       - docker-config
     volumes:
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
index c603bb51df3..d9864dd271f 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
@@ -17,7 +17,7 @@
 # reusable fragments (see https://docs.docker.com/compose/compose-file/#extension-fields)
 x-old-config:
   &old-config
-  image: apache/ozone:${OZONE_VERSION}
+  image: apache/ozone:${OZONE_VERSION}-rocky
   env_file:
     - docker-config
   volumes: