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 b981afbf89e HDDS-15508. Add 2.2.0 to compatibility/upgrade test
(#10782)
b981afbf89e is described below
commit b981afbf89e28e8fb182ec9ba4e1025b9e7ea405
Author: Hui Fei <[email protected]>
AuthorDate: Thu Jul 16 20:06:50 2026 +0800
HDDS-15508. Add 2.2.0 to compatibility/upgrade test (#10782)
---
hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 7 ++++---
hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml | 4 ++++
hadoop-ozone/dist/src/main/compose/xcompat/lib.sh | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
index 89f054f6a9c..e6c13160711 100755
--- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
@@ -33,10 +33,11 @@ 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.1.1 "$OZONE_CURRENT_VERSION"
+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"
+# 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"
# 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"
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
index a6e49b4eff6..3d5be97f8f5 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
@@ -73,6 +73,10 @@ services:
image: ${OZONE_IMAGE}:2.1.1${OZONE_IMAGE_FLAVOR}
<<: *old-config
+ old_client_2_2_0:
+ image: ${OZONE_IMAGE}:2.2.0${OZONE_IMAGE_FLAVOR}
+ <<: *old-config
+
new_client:
<<: *new-config
environment:
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
index 8583761c2b6..ef71eac1586 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
@@ -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" # 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" # container is needed
for each version in clients.yaml
export SECURITY_ENABLED=true
: ${OZONE_BUCKET_KEY_NAME:=key1}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
