From 805e38122dfd66b62342c853e80ee40a43ef4fd1 Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Sun, 30 Mar 2025 22:00:25 +0800 Subject: [PATCH 1/2] HDDS-11107, remove unnecessary run test command --- hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 5 +---- 1 file changed, 1 insertion(+), 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 d449f14ebba5..14355efdab46 100755 --- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh @@ -25,9 +25,6 @@ source "$TEST_DIR/testlib.sh" export TEST_DIR export COMPOSE_DIR="$TEST_DIR" -RESULT=0 -run_test_scripts ${tests} || RESULT=$? - RESULT_DIR="$ALL_RESULT_DIR" create_results_dir # Upgrade tests to be run. In CI we want to run just one set, but for a release @@ -44,4 +41,4 @@ run_test ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION" generate_report "upgrade" "$ALL_RESULT_DIR" -exit "$RESULT" +exit "$?" From 6b8f65457b67f1841f1a741ed7623261390fe128 Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Tue, 1 Apr 2025 20:45:53 +0800 Subject: [PATCH 2/2] HDDS-11107. Keep the test result in $RESULT --- hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh index 14355efdab46..100aba983970 100755 --- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh @@ -41,4 +41,4 @@ run_test ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION" generate_report "upgrade" "$ALL_RESULT_DIR" -exit "$?" +exit "$RESULT"