HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241

)
ptlrs · Sep 28, 2024 · a214a31 · a214a31
1 parent 56ddb85
commit a214a31
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -16,7 +16,7 @@
 
 services:
   old_client_1_0_0:
-    image: apache/ozone:1.0.0
+    image: apache/ozone:1.0.0-rocky
     env_file:
       - docker-config
     volumes:
@@ -25,7 +25,7 @@ services:
       - ./krb5.conf:/etc/krb5.conf
     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:
@@ -34,7 +34,7 @@ services:
       - ./krb5.conf:/etc/krb5.conf
     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:
@@ -43,7 +43,7 @@ services:
       - ./krb5.conf:/etc/krb5.conf
     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:
@@ -52,7 +52,7 @@ services:
       - ./krb5.conf:/etc/krb5.conf
     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
@@ -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
   dns_search: .
   env_file:
     - docker-config