From 8454699d333cf7b9493da354c26367cff7ca0d1e Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Fri, 4 Apr 2025 20:28:33 +0800 Subject: [PATCH 1/2] HDDS-12700. Add compose-cluster directory to upgrade test result path to prevent overwrite --- hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh index bad0a704d392..808bc380eb8b 100755 --- a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh @@ -106,7 +106,7 @@ run_test() { local test_dir="$_upgrade_dir/upgrades/$upgrade_type" local callback_dir="$test_dir"/callbacks - local execution_dir="$test_dir"/execution/"${OZONE_UPGRADE_FROM}-${OZONE_UPGRADE_TO}" + local execution_dir="$test_dir"/execution/"$compose_cluster"/"${OZONE_UPGRADE_FROM}-${OZONE_UPGRADE_TO}" local compose_dir="$_upgrade_dir"/compose/"$compose_cluster" # Export variables needed by test, since it is run in a subshell. export OZONE_UPGRADE_CALLBACK="$callback_dir"/"$OZONE_UPGRADE_TO"/callback.sh From 49a0a45d275d3b51a4dd9c4f2ca52c67e7c11a63 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com> Date: Sat, 5 Apr 2025 08:13:50 +0200 Subject: [PATCH 2/2] Include cluster and upgrade type in leaf directory name Co-authored-by: Peter Lee --- hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh index 808bc380eb8b..932c6a6e3c5f 100755 --- a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh @@ -106,7 +106,7 @@ run_test() { local test_dir="$_upgrade_dir/upgrades/$upgrade_type" local callback_dir="$test_dir"/callbacks - local execution_dir="$test_dir"/execution/"$compose_cluster"/"${OZONE_UPGRADE_FROM}-${OZONE_UPGRADE_TO}" + local execution_dir="$test_dir"/execution/"$compose_cluster-$upgrade_type-${OZONE_UPGRADE_FROM}-${OZONE_UPGRADE_TO}" local compose_dir="$_upgrade_dir"/compose/"$compose_cluster" # Export variables needed by test, since it is run in a subshell. export OZONE_UPGRADE_CALLBACK="$callback_dir"/"$OZONE_UPGRADE_TO"/callback.sh