Skip to content

HDDS-10168. Add Ozone 1.4.0 to compatibility acceptance tests #6040

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 1 commit into from
Jan 21, 2024
Merged

HDDS-10168. Add Ozone 1.4.0 to compatibility acceptance tests #6040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions hadoop-ozone/dist/src/main/compose/upgrade/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ RESULT_DIR="$ALL_RESULT_DIR" create_results_dir

# This is the version of Ozone that should use the runner image to run the
# code that was built. Other versions will pull images from docker hub.
export OZONE_CURRENT_VERSION=1.4.0
run_test ha non-rolling-upgrade 1.3.0 "$OZONE_CURRENT_VERSION"
export OZONE_CURRENT_VERSION=1.5.0
run_test ha non-rolling-upgrade 1.4.0 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 1.3.0 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 1.2.1 "$OZONE_CURRENT_VERSION"
# run_test om-ha non-rolling-upgrade 1.1.0 "$OZONE_CURRENT_VERSION"

Expand Down
7 changes: 7 additions & 0 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 @@ -45,6 +45,13 @@ services:
volumes:
- ../..:/opt/ozone
command: ["sleep","1000000"]
old_client_1_4_0:
image: apache/ozone:1.4.0
env_file:
- docker-config
volumes:
- ../..:/opt/ozone
command: ["sleep","1000000"]
new_client:
image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
env_file:
Expand Down
6 changes: 3 additions & 3 deletions hadoop-ozone/dist/src/main/compose/xcompat/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
basename=$(basename ${COMPOSE_DIR})

current_version=1.4.0
old_versions="1.0.0 1.1.0 1.2.1 1.3.0" # container is needed for each version in clients.yaml
current_version=1.5.0
old_versions="1.0.0 1.1.0 1.2.1 1.3.0 1.4.0" # container is needed for each version in clients.yaml

# shellcheck source=hadoop-ozone/dist/src/main/compose/testlib.sh
source "${COMPOSE_DIR}/../testlib.sh"
Expand Down Expand Up @@ -77,7 +77,7 @@ test_cross_compatibility() {

test_ec_cross_compatibility() {
echo "Running Erasure Coded storage backward compatibility tests."
local cluster_versions_with_ec="1.3.0"
local cluster_versions_with_ec="1.3.0 1.4.0"
local non_ec_client_versions="1.0.0 1.1.0 1.2.1"

for cluster_version in ${cluster_versions_with_ec}; do
Expand Down