From: James Nunez <james.a.nunez@intel.com>
Date: Mon, 26 Feb 2018 17:59:50 +0000 (-0700)
Subject: LU-9444 tests: replace SINGLEMDS1 with SINGLEMDS
X-Git-Tag: 2.10.4-RC1~23
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1b46e60695cace477dfa7e540de10bf88a118eaf;p=fs%2Flustre-release.git

LU-9444 tests: replace SINGLEMDS1 with SINGLEMDS

In conf-sanity test 87, we use the global variable SINGLEMDS1
to get the version of the MDS. SINGLEMDS1 is not defined and
the test should use SINGLEMDS to check the version of the MDS.

Lustre-change: https://review.whamcloud.com/31420
Lustre-commit: 5f00d6f5fce28c7cee3b400601e265358e3cdc66

Test-Parameters: trivial testlist=conf-sanity
Test-Parameters: envdefinitions=ONLY=87 mdsjob=lustre-b2_9 ossjob=lustre-b2_9 serverbuildno=22 testlist=conf-sanity
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: Ic8b1f32b87cc596fcc2e98d5b6095b6e4171bfd7
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Saurabh Tandan <saurabh.tandan@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/31967
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 3a0d7f9..f00bf43 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -6155,7 +6155,7 @@ test_86() {
 run_test 86 "Replacing mkfs.lustre -G option"
 
 test_87() { #LU-6544
-	[[ $(lustre_version_code $SINGLEMDS1) -ge $(version_code 2.9.51) ]] ||
+	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.9.51) ]] ||
 		{ skip "Need MDS version at least 2.9.51" && return; }
 	[[ $(facet_fstype $SINGLEMDS) != ldiskfs ]] &&
 		{ skip "ldiskfs only test" && return; }