Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Sep 28, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76c3264
HDDS-11329. Update Ozone images to Rocky Linux-based runner
adoroszlai Sep 18, 2024
a581be5
Merge remote-tracking branch 'origin/master' into HDDS-11329
adoroszlai Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
10 changes: 5 additions & 5 deletions hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down