This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new a214a3153b HDDS-11329. Update Ozone images to Rocky Linux-based runner
(#7241)
a214a3153b is described below
commit a214a3153bae76df8c27a878e4b8a6b1ea78744b
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat Sep 28 09:22:32 2024 +0200
HDDS-11329. Update Ozone images to Rocky Linux-based runner (#7241)
---
hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh | 4 ++--
hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml | 10 +++++-----
hadoop-ozone/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 69af73f50c..d2718d04b7 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 bfb346f074..eda1435368 100644
--- 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
index 941cbc14df..d1b6e56a08 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
dns_search: .
env_file:
- docker-config
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
