Skip to content

HDDS-16109. Update upgrade/xcompat tests to use 2.2.1 #11133

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

Open
jojochuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HDDS-16109. Update upgrade/xcompat tests to use 2.2.1 #11133

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
4 changes: 2 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 @@ -33,8 +33,8 @@ 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.
run_test ha non-rolling-upgrade 2.2.0 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 2.1.1 "$OZONE_CURRENT_VERSION"
run_test ha non-rolling-upgrade 2.2.1 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 2.2.0 "$OZONE_CURRENT_VERSION"

@adoroszlai adoroszlai Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this (disabled) for previous minor release:

Suggested change
# run_test ha non-rolling-upgrade 2.2.0 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 2.1.1 "$OZONE_CURRENT_VERSION"

# run_test ha non-rolling-upgrade 2.0.0 "$OZONE_CURRENT_VERSION"
# run_test non-ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION"
Expand Down
4 changes: 4 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 @@ -77,6 +77,10 @@ services:
image: ${OZONE_IMAGE}:2.2.0${OZONE_IMAGE_FLAVOR}
<<: *old-config

old_client_2_2_1:
image: ${OZONE_IMAGE}:2.2.1${OZONE_IMAGE_FLAVOR}
<<: *old-config

new_client:
<<: *new-config
environment:
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ source "${COMPOSE_DIR}/../testlib.sh"

current_version="${OZONE_CURRENT_VERSION}"
# TODO: debug acceptance test failures for client versions 1.0.0 on secure clusters
old_versions="1.1.0 1.2.1 1.3.0 1.4.1 2.0.0 2.1.1 2.2.0" # container is needed for each version in clients.yaml
old_versions="1.1.0 1.2.1 1.3.0 1.4.1 2.0.0 2.1.1 2.2.0 2.2.1" # container is needed for each version in clients.yaml

@adoroszlai adoroszlai Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think testing with latest patch release from each minor release line is enough:

Suggested change
old_versions="1.1.0 1.2.1 1.3.0 1.4.1 2.0.0 2.1.1 2.2.0 2.2.1" # container is needed for each version in clients.yaml
old_versions="1.1.0 1.2.1 1.3.0 1.4.1 2.0.0 2.1.1 2.2.1" # container is needed for each version in clients.yaml

old_client_2_2_0 may also be removed from clients.yaml.


export SECURITY_ENABLED=true
: ${OZONE_BUCKET_KEY_NAME:=key1}
Expand Down