From 495a6f01a30855c72aa0ec4fda12f961342a97a3 Mon Sep 17 00:00:00 2001 From: James Nunez Date: Sat, 18 Apr 2020 02:11:14 -0700 Subject: [PATCH] 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. This patch is back-ported from the following one: Lustre-commit: 34e4c37474b3d9328aac1dd9228a018ac7d4f47e Lustre-change: https://review.whamcloud.com/37270 Test-Parameters: trivial clientdistro=el8.1 Signed-off-by: James Nunez Change-Id: I60174dcd4776b53ac5b44be6c208d40e1f022445 Reviewed-on: https://review.whamcloud.com/38260 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/tests/lnet-selftest.sh | 10 +--------- lustre/tests/sanity.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lustre/tests/lnet-selftest.sh b/lustre/tests/lnet-selftest.sh index 10631ca..d2364a0 100755 --- a/lustre/tests/lnet-selftest.sh +++ b/lustre/tests/lnet-selftest.sh @@ -9,19 +9,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 - [ x$LST = x ] && skip_env "lst not found LST=$LST" # FIXME: what is the reasonable value here? diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 3b76782..2418035 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -72,11 +72,18 @@ get_lustre_env init_logging # 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 300o" -- 1.8.3.1