From 19e6f6f234101bdc0666bcc8be2c1afb396925e8 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 1 Feb 2022 03:04:19 -0700 Subject: [PATCH] LU-15506 tests: skip conf-sanity test_32b until fixed The new disk2_10-ldiskfs and disk2_12-ldiskfs images are failing conf-sanity test_32b. Rather than remove the images themselves, which are large and would consume more space in Gerrit if removed and re-added, instead skip them until the test can be fixed/o Test-Parameters: trivial testlist=conf-sanity env=ONLY=32 Fixes: f2143c0790bb ("LU-11643 tests: add new images and tests for upgrade tests") Signed-off-by: Andreas Dilger Change-Id: I5e6af27669773f67b16786aeffc24e995e3ebbe5 Reviewed-on: https://review.whamcloud.com/46403 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Nunez --- lustre/tests/conf-sanity.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index a89897a..0a07e92 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -2809,6 +2809,9 @@ test_32b() { t32_check for tarball in $tarballs; do + # temporarily skip these multi-MDT tests LU-15506 + [[ "$tarball" =~ "2_10" || "$tarball" =~ "2_12" ]] && + { echo "skip $(basename $tarball)"; continue; } banner "testing $tarball upgrade with writeconf" t32_test $tarball writeconf || let "rc += $?" done @@ -2864,7 +2867,8 @@ test_32e() { t32_check for tarball in $tarballs; do - [[ "$tarball" =~ "2_9" ]] || continue + [[ "$tarball" =~ "2_9" ]] || + { echo "skip $(basename $tarball)"; continue; } #load_modules banner "testing $tarball upgrade with DoM" dom_upgrade=yes t32_test $tarball writeconf || let "rc += $?" @@ -2883,7 +2887,8 @@ test_32f() { t32_check for tarball in $tarballs; do - echo $tarball | grep "2_10" || continue + [[ "$tarball" =~ "2_10" ]] || + { echo "skip $(basename $tarball)"; continue; } pfl_upgrade=yes project_quota_upgrade=yes \ t32_test $tarball writeconf || let "rc += $?" done @@ -2901,7 +2906,8 @@ test_32g() { t32_check for tarball in $tarballs; do - echo $tarball | grep "2_12" || continue + [[ $tarball =~ "2_12" ]] || + { echo "skip $(basename $tarball)"; continue; } flr_upgrade=yes dom_new_upgrade=yes \ t32_test $tarball writeconf || let "rc += $?" done -- 1.8.3.1