From 97e863964871462d4e5d98492182be52782ab9d4 Mon Sep 17 00:00:00 2001 From: James Nunez Date: Wed, 2 Jan 2019 15:38:58 -0700 Subject: [PATCH] LU-11402 tests: add version check sanity-quota 60 sanity-quota test 60 was added to Lustre tag 2.11.53. Thus, we need to check that the server is 2.11.53 or later before running test 60. This patch is back-port from: Lustre-commit: d187a78afc960849c3eb86a1a0559c9ba00e8cdf Lustre-change: https://review.whamcloud.com/33418 Test-Parameters: trivial serverjob=lustre-b2_10 serverbuildno=152 testlist=sanity-quota Test-Parameters: testlist=sanity-quota Signed-off-by: James Nunez Change-Id: I5db738f0776b5615165977df1708f197f215b994 Reviewed-by: Wei Liu Reviewed-by: Jian Yu Reviewed-on: https://review.whamcloud.com/34094 Reviewed-by: Andreas Dilger Tested-by: Jenkins Tested-by: Maloo --- lustre/tests/sanity-quota.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 86c54fe..b49e03c 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -34,6 +34,7 @@ LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)} . $LUSTRE/tests/test-framework.sh init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} +get_lustre_env init_logging DIRECTIO=${DIRECTIO:-$LUSTRE/tests/directio} @@ -3097,8 +3098,11 @@ test_59() { run_test 59 "lfs project dosen't crash kernel with project disabled" test_60() { + [ $MDS1_VERSION -lt $(version_code 2.11.53) ] && + skip "Needs MDS version 2.11.53 or later." setup_quota_test || error "setup quota failed with $?" trap cleanup_quota_test EXIT + local testfile=$DIR/$tdir/$tfile local limit=100 -- 1.8.3.1