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 560fcdf90c HDDS-12728. Add Ozone 2.0.0 to compatibility acceptance
tests (#8361)
560fcdf90c is described below
commit 560fcdf90c04501b621b79339764a3585a4293e3
Author: Chia-Chuan Yu <[email protected]>
AuthorDate: Thu May 1 14:48:35 2025 +0800
HDDS-12728. Add Ozone 2.0.0 to compatibility acceptance tests (#8361)
---
hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 5 +++--
hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml | 4 ++++
hadoop-ozone/dist/src/main/compose/xcompat/lib.sh | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
index 20f0e02d49..ba476bc7b7 100755
--- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
@@ -33,8 +33,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.
-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 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 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 567845e088..1edaf15fdc 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
@@ -65,6 +65,10 @@ services:
image: ${OZONE_IMAGE}:1.4.1${OZONE_IMAGE_FLAVOR}
<<: *old-config
+ old_client_2_0_0:
+ image: ${OZONE_IMAGE}:2.0.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 fa7218d9bc..5e53515b6f 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.0 1.4.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" # 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]
