From: Alena Nikitenko <anikitenko@ddn.com>
Date: Wed, 12 Jan 2022 16:08:39 +0000 (+0300)
Subject: EX-3342 tests: correct Lustre version checks in sanity
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=06a2859754a5af0bdb0d199f50afabacb9fad7aa;p=fs%2Flustre-release.git

EX-3342 tests: correct Lustre version checks in sanity

Many patches land to the EXAScaler branches as ports from
other branches.  Sometimes the tests that are included with
the ported patches check the version of Lustre to ensure
that the feature it tests exists in this version of Lustre.
These version values are not always changed when patches
are ported from one branch to another.

Modified b_es6_0 version of these tests for interop
testing.

Sanity tests 65n and 311 were modified.
Performing test steps on versions >= 2.12.59 or between
versions 2.12.3 and 2.12.50 makes no sense for b_es5_2
branch, because all Lustre tags on this branch are lower
than 2.12.50.
Checks in test 65n will be changed to >= 2.12.3.6 which
is a tag for the patch that added this test to b_es5_2
branch.
Version check in test 311 is not needed at all, because
it includes all possible versions on b_es5_2 branch.

Lustre-change: https://review.whamcloud.com/46068
Lustre-commit: 2d92fc888e12fb7b58d496952ccd69dd10299c09

Test-Parameters: env=ONLY="65n 311" serverversion=2.10.8 serverdistro=el7.6
Test-Parameters: env=ONLY="65n 311" serverversion=2.14
Test-Parameters: trivial env=ONLY="65n 311"
Test-Parameters: env=ONLY="65n 311" clientversion=2.12.6-ddn42
Test-Parameters: env=ONLY="65n 311" serverversion=2.12.6-ddn42

Fixes: 550e41edbcb ("LU-11739 lod: subdir under ROOT should honor default layout")
Fixes: 37a9077f103 ("LU-11208 tests: add version check to sanity tests")

Signed-off-by: Alena Nikitenko <anikitenko@ddn.com>
Change-Id: Ic6383fe5585e18646a365f49f501da52848c765a
Reviewed-on: https://review.whamcloud.com/46421
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e83d11a..66fd30b 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -8781,8 +8781,8 @@ test_65n() {
 	# though subdir under ROOT doesn't inherit default layout, but
 	# its sub dir/file should be created with default layout.
 	[[ $MDSCOUNT -ge 2 ]] || skip_env "needs >= 2 MDTs"
-	[[ $MDS1_VERSION -ge $(version_code 2.12.59) ]] ||
-		skip "Need MDS version at least 2.12.59"
+	[[ $MDS1_VERSION -ge $(version_code 2.12.3.6) ]] ||
+		skip "Need MDS version at least 2.12.3.6"
 
 	local default_lmv_count=$($LFS getdirstripe -D -c $MOUNT)
 	local default_lmv_index=$($LFS getdirstripe -D -i $MOUNT)
@@ -23135,9 +23135,8 @@ test_311() {
 
 	do_nodes $mdts "$LCTL set_param -n \
 			osp.*OST0000*.max_create_count=$max_count"
-	[ $MDS1_VERSION -lt $(version_code 2.12.51) ] &&
-		do_nodes $mdts "$LCTL set_param -n \
-				osp.*OST0000*.create_count=$count"
+	do_nodes $mdts "$LCTL set_param -n \
+			osp.*OST0000*.create_count=$count"
 	do_nodes $mdts "$LCTL get_param osp.*OST0000*.create_count" |
 			grep "=0" && error "create_count is zero"