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 5b32c7dd6c HDDS-11333. Avoid hard-coded current version in
upgrade/xcompat tests (#7089)
5b32c7dd6c is described below
commit 5b32c7dd6cfc1b7852320857ed19ae9440031d39
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Aug 23 09:28:17 2024 +0200
HDDS-11333. Avoid hard-coded current version in upgrade/xcompat tests
(#7089)
---
hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 2 +-
hadoop-ozone/dist/src/main/compose/xcompat/test.sh | 5 +++--
2 files changed, 4 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 9d7ec5d4e6..6fc4763631 100755
--- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
@@ -35,7 +35,7 @@ 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.5.0
+export OZONE_CURRENT_VERSION="${ozone.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/test.sh
b/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
index 419d397c19..695d8bf06a 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
@@ -21,7 +21,7 @@ COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"
>/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
basename=$(basename ${COMPOSE_DIR})
-current_version=1.5.0
+current_version="${ozone.version}"
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
@@ -77,7 +77,8 @@ test_cross_compatibility() {
test_ec_cross_compatibility() {
echo "Running Erasure Coded storage backward compatibility tests."
- local cluster_versions_with_ec="1.3.0 1.4.0"
+ # local cluster_versions_with_ec="1.3.0 1.4.0 ${current_version}"
+ local cluster_versions_with_ec="${current_version}" # until HDDS-11334
local non_ec_client_versions="1.0.0 1.1.0 1.2.1"
for cluster_version in ${cluster_versions_with_ec}; do
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
