From 4a8e06fb5af88f93a936ed8ba0718ff5d3554c9f Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 17 Jan 2020 16:38:02 -0700 Subject: [PATCH 1/1] LU-13063 tests: remove checks for old RHEL versions There was a check in sanity test_17g for RHEL6.5, but we haven't been testing that client version for some time, and 6.5 no longer works on master. Remove this check entirely Similarly, is_project_quota_supported() was trying to check for RHEL7, but the lfs check was being done on the client. It was also wrong for RHEL8 kernels, and would incorrectly match any version with a "7" in it. Move lfs check to the MDS, and don't check the kernel version. Test-Parameters: trivial testlist=sanity-quota Signed-off-by: Andreas Dilger Change-Id: If115b65ba8bc09b6c292ec9cf2e949c8153ebbe5 Reviewed-on: https://review.whamcloud.com/37272 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 5 ----- lustre/tests/test-framework.sh | 17 ++++++----------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index ffacbce..fb48a67 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -556,11 +556,6 @@ test_17g() { [ $MDS1_VERSION -le $(version_code 2.3.55) ] && TESTS="4094 4095" - # skip long symlink name for rhel6.5. - # rhel6.5 has a limit (PATH_MAX - sizeof(struct filename)) - grep -q '6.5' /etc/redhat-release &>/dev/null && - TESTS="59 60 61 4062 4063" - for i in $TESTS; do local SYMNAME=$(str_repeat 'x' $i) ln -s $SYMNAME $DIR/$tdir/f$i || error "failed $i-char symlink" diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 25ce901..fd829d6 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -9719,19 +9719,14 @@ verify_yaml_layout() { is_project_quota_supported() { $ENABLE_PROJECT_QUOTAS || return 1 - [ "$(facet_fstype $SINGLEMDS)" == "ldiskfs" ] && - [ $(lustre_version_code $SINGLEMDS) -gt \ - $(version_code 2.9.55) ] && - lfs --help | grep project >&/dev/null && - egrep -q "7." /etc/redhat-release && return 0 - if [ "$(facet_fstype $SINGLEMDS)" == "zfs" ]; then - [ $(lustre_version_code $SINGLEMDS) -le \ - $(version_code 2.10.53) ] && return 1 + [[ "$(facet_fstype $SINGLEMDS)" == "ldiskfs" && + $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.9.55) ]] && + do_facet mds1 lfs --help |& grep -q project && return 0 - do_facet mds1 $ZPOOL get all | - grep -q project_quota && return 0 - fi + [[ "$(facet_fstype $SINGLEMDS)" == "zfs" && + $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.10.53) ]] && + do_facet mds1 $ZPOOL get all | grep -q project_quota && return 0 return 1 } -- 1.8.3.1