From 42abf7922f8cd7be5df8ac69a46b2115480a9f61 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Thu, 27 Aug 2026 15:33:10 -0700 Subject: [PATCH] HDDS-16109. Update upgrade/xcompat tests to use 2.2.1 Add 2.2.1 client image to xcompat compose and run upgrade test from 2.2.1. Co-authored-by: Cursor Change-Id: I108e633cca22aa6b3f177dea7f16d84404b49720 --- hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 4 ++-- hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml | 4 ++++ hadoop-ozone/dist/src/main/compose/xcompat/lib.sh | 2 +- 3 files changed, 7 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 e6c13160711..1c7619d96c0 100755 --- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh @@ -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" # 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" diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml index 3d5be97f8f5..39e74ee4d8a 100644 --- a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml +++ b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml @@ -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: diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh index ef71eac1586..431392e96cf 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 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 export SECURITY_ENABLED=true : ${OZONE_BUCKET_KEY_NAME:=key1}