From b671d0904e4af33e72764891b0170db9e5a2f75c Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Sat, 13 Apr 2024 21:08:48 -0600 Subject: [PATCH] LU-4341 tests: re-enable SLES sanity test_170 test_243 Re-enable tests on SLES that has been disabled since SLES11. The SLES version check was broken and these were already running on SLES15 without issues. Test-Parameters: trivial Test-Parameters: testlist=sanity env=ONLY="170 243",ONLY_REPEAT=20 clientdistro=sles15sp5 Signed-off-by: Andreas Dilger Change-Id: I0f837ac5180d0754b67f349592503267aa2c5f52 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54777 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Arshad Hussain Reviewed-by: Jian Yu Reviewed-by: James Simmons Reviewed-by: Sarah Liu Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 56fdc84..3ff6c03 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -82,29 +82,7 @@ fi proc_regexp="/{proc,sys}/{fs,sys,kernel/debug}/{lustre,lnet}/" -# Get the SLES distro version -# -# Returns a version string that should only be used in comparing -# strings returned by version_code() -sles_version_code() -{ - local version=$(grep VERSION_ID /etc/os-release | cut -d'"' -f2) - - # All SuSE Linux versions have one decimal. version_code expects two - local sles_version=$version.0 - version_code $sles_version -} - -# Check if we are running on Ubuntu or SLES so we can make decisions on -# what tests to run -if [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ]; then - sles_version=$(sles_version_code) - (( $sles_version >= $(version_code 11.4.0) )) || - always_except LU-4341 170 - - (( $sles_version >= $(version_code 12.0.0) )) || - always_except LU-3703 234 -elif [ -r /etc/redhat-release ]; then +if [ -r /etc/redhat-release ]; then rhel_version=$(cat /etc/redhat-release | sed -e 's/^[^0-9.]*//g' | sed -e 's/[ ].*//') if (( $(version_code $rhel_version) >= $(version_code 9.3.0) )); then -- 1.8.3.1