LU-17761 tests: make sanity-compr sanity/sanityn return 0

While running sanity-compr sanity/sanityn, if there was
sub-subtest failure, the sanity/sanityn test_cleanup would
be incorrectly marked as FAIL.

We should leave it to the individual sanity/sanityn subtests
to mark their failures, test_sanity() and test_sanityn()
should not also return an error.

Lustre-change: https://review.whamcloud.com/54855
Lustre-commit: TBD (from 96767ff8af44b5dac0677db759634515de1d1802)

Test-Parameters: trivial testlist=sanity-compr
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Change-Id: I1fd645b80b92e583f1a564f85e6d2d6d871b8fa8
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54856
Reviewed-by: Artem Blagodarenko <ablagodarenko@ddn.com>
Reviewed-by: Sarah Liu <sarah@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/sanity-compr.sh b/lustre/tests/sanity-compr.sh
index e530b1b..89052b7 100644 (file)
--- a/lustre/tests/sanity-compr.sh
+++ b/lustre/tests/sanity-compr.sh
@@ -156,25 +156,20 @@ test_sanity()
        always_except LU-16904 906
        always_except EX-7938 100
        always_except EX-8927 430c
-       local rc
 
        [[ -n "$SANITYN_ONLY" && -z "$SANITY_ONLY" ]] && return 0
 
        SANITY_EXCEPT=$ALWAYS_EXCEPT ONLY=$SANITY_ONLY bash sanity.sh
-       rc=$?
-       return $rc
+       return 0
 }
 run_test sanity "Run sanity with PFL layout"
 
 test_sanityn()
 {
-       local rc
-
        [[ -n "$SANITY_ONLY" && -z "$SANITYN_ONLY" ]] && return 0
 
        SANITYN_EXCEPT=$ALWAYS_EXCEPT ONLY=$SANITYN_ONLY bash sanityn.sh
-       rc=$?
-       return $rc
+       return 0
 }
 run_test sanityn "Run sanityn with PFL layout"