From: James Nunez <jnunez@whamcloud.com>
Date: Fri, 17 Jan 2020 19:24:15 +0000 (-0700)
Subject: LU-13063 tests: stop running sanity test 411
X-Git-Tag: 2.13.52~65
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=34e4c37474b3d9328aac1dd9228a018ac7d4f47e

LU-13063 tests: stop running sanity test 411

sanity test 411 hits a kernel bug for RHEL 8.1.  Since this
is an issue with the kernel and not Lustre, let's stop
running this test until the kernel is patched.  Thus, we
need to add sanity test 411 to the ALWAYS_EXCEPT list.

Also change the ALWAYS_EXCEPT condition for test smoke for
lnet-selftest to be based on kernel version and not
architecture, so that the custom test for this patch can
pass.

Test-Parameters: trivial clientdistro=el8.1
Signed-off-by: James Nunez <jnunez@whamcloud.com>
Change-Id: I60174dcd4776b53ac5b44be6c208d40e1f022445
Reviewed-on: https://review.whamcloud.com/37270
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
---

diff --git a/lustre/tests/lnet-selftest.sh b/lustre/tests/lnet-selftest.sh
index 93432e0..d015b05 100755
--- a/lustre/tests/lnet-selftest.sh
+++ b/lustre/tests/lnet-selftest.sh
@@ -6,19 +6,11 @@ init_test_env $@
 init_logging
 
 ALWAYS_EXCEPT="$LNET_SELFTEST_EXCEPT"
-if [[ $(uname -m) = aarch64 ]]; then
+if (( $LINUX_VERSION_CODE >= $(version_code 4.4.0) )); then
 	# bug number for skipped test: LU-10073
 	ALWAYS_EXCEPT+="               smoke"
 fi
 
-# Check if running on Ubuntu client
-if [ -r /etc/os-release ]; then
-	if grep -qi ubuntu /etc/os-release; then
-		# bug number for skipped test: LU-10073
-		ALWAYS_EXCEPT+="               smoke"
-	fi
-fi
-
 build_test_filter
 
 [ x$LST = x ] && skip_env "lst not found LST=$LST"
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index bd86a55..ffacbce 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -64,10 +64,16 @@ if [[ $(uname -m) = aarch64 ]]; then
 fi
 
 # skip nfs tests on kernels >= 4.14.0 until they are fixed
-if [ $LINUX_VERSION_CODE -ge $(version_code 4.14.0) ];then
+if [ $LINUX_VERSION_CODE -ge $(version_code 4.14.0) ]; then
 	# bug number:	LU-12661
 	ALWAYS_EXCEPT+=" 817"
 fi
+# skip cgroup tests on RHEL8.1 kernels until they are fixed
+if (( $LINUX_VERSION_CODE >= $(version_code 4.18.0) &&
+      $LINUX_VERSION_CODE <  $(version_code 5.4.0) )); then
+	# bug number:	LU-13063
+	ALWAYS_EXCEPT+=" 411"
+fi
 
 #                                  5          12          (min)"
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="27m 64b 68 71 115 135 136 300o"