From ba5346b050fb395844252a706d4dba2ef0e0d8dc Mon Sep 17 00:00:00 2001
From: Andreas Dilger <adilger@whamcloud.com>
Date: Mon, 6 Mar 2023 18:00:41 -0700
Subject: [PATCH] LU-7668 tests: skip conf-sanity test_33a for old MGS

Skip del_ost test for MGS versions that do not have this command.

Test-Parameters: trivial
Test-Parameters: testlist=conf-sanity env=ONLY="33a 123ah" serverversion=2.15.0
Fixes: 1121816c4a ("LU-7668 utils: add lctl del_ost")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ib8ca9c604404e5717533be32fd6b5ccfbf70428e
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50221
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alex Deiter <alex.deiter@gmail.com>
Reviewed-by: Sarah Liu <sarah@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 lustre/tests/conf-sanity.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 713d524..3a811b4 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -3041,13 +3041,18 @@ test_33a() { # bug 12333, was test_33
 
 	umount $MOUNT2
 
-	# test lctl del_ost on large index
-	do_facet mgs "$LCTL del_ost -t ${FSNAME2}-OST1fff" ||
-		error "del_ost failed with $?"
-	$MOUNT_CMD $MGSNID:/${FSNAME2} $MOUNT2 || error "$MOUNT_CMD failed"
-	echo "ok."
-	$LFS df | grep -q OST1fff && error "del_ost did not remove OST1fff!"
-	umount $MOUNT2
+	if (( "$MGS_VERSION" >= $(version_code 2.15.51) &&
+	      "$MDS1_VERSION" >= $(version_code 2.15.51) )); then
+		# test lctl del_ost on large index
+		do_facet mgs "$LCTL del_ost -t ${FSNAME2}-OST1fff" ||
+			error "del_ost failed with $?"
+		$MOUNT_CMD $MGSNID:/${FSNAME2} $MOUNT2 ||
+			error "$MOUNT_CMD failed"
+		echo "ok."
+		$LFS df | grep -q OST1fff &&
+			error "del_ost did not remove OST1fff!"
+		umount $MOUNT2
+	fi
 
 	stop fs2ost -f
 	stop fs2mds -f
@@ -9750,9 +9755,9 @@ test_123ag() { # LU-15142
 run_test 123ag "llog_print skips values deleted by set_param -P -d"
 
 test_123ah() { #LU-7668 del_ost
-	[ "$MGS_VERSION" -ge $(version_code 2.15.50) -a \
-	   "$MDS1_VERSION" -ge $(version_code 2.15.50) ] ||
-		skip "Need both MGS and MDS version at least 2.15.50"
+	(( "$MGS_VERSION" >= $(version_code 2.15.51) &&
+	   "$MDS1_VERSION" >= $(version_code 2.15.51) )) ||
+		skip "Need MGS/MDS version >= 2.15.51 for del_ost"
 
 	[ -d $MOUNT/.lustre ] || setupall
 	stack_trap "do_facet mds1 $LCTL set_param fail_loc=0" EXIT
-- 
1.8.3.1