Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
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
env_file:
- docker-config
volumes:
Expand Down