From 430b8a906fe3ac8faab6fb5fb1800bf252b36950 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Fri, 27 Jul 2018 19:59:32 -0400 Subject: [PATCH] LU-10947 build: test if xfsprogs are installed We need xfsprogs because conf-sanity test_116 use mkfs.xfs. No need to install the xfsprogs for a single test so just skip the test if mkfs.xfs is not available. Set $tmpmnt to $TMP/$tdir since /mnt is read only for my diskless setup. The $TMP is not in my setup. Test-Parameters: trivial testlist=conf-sanity mdsdistro=sles12sp3 ossdistro=sles12sp3 Change-Id: I1db88afe7e382e1032ed7e2844a1dec1c032530e Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/32539 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Nunez --- lustre/tests/conf-sanity.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 1756b16..c53ead1 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -8057,10 +8057,15 @@ test_116() { [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.59) ] && skip "Need server version at least 2.10.59" && return + do_facet $SINGLEMDS which mkfs.xfs || { + skip_env "No mkfs.xfs installed" + return + } + stopall load_modules - local tmpmnt=/mnt/$tdir + local tmpmnt=$TMP/$tdir local mdtimg=$tfile-mdt0 do_facet $SINGLEMDS mkdir -p $tmpmnt -- 1.8.3.1