From d5036b55b8c137aa6752e7cf585ce6a6a7c9e181 Mon Sep 17 00:00:00 2001 From: Charlie Olmstead Date: Mon, 27 Mar 2023 14:08:57 -0600 Subject: [PATCH] LU-16672 tests: auster node.yml labels Alma and Rocky as CentOS release() assumes a node with /etc/centos-release is CentOS. This patch removes that assumption and uses the name in the centos-release file. Corrected the os-release code to strip off the last word if present. Test-Parameters: trivial Change-Id: Ia5acbce3351ca23f4d9265d1aaf8d952a2c8b502 Signed-off-by: Charlie Olmstead Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50442 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Timothy Day Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/yaml.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh index bd08571..8440996 100644 --- a/lustre/tests/yaml.sh +++ b/lustre/tests/yaml.sh @@ -78,13 +78,15 @@ release() { rhel_pat=".*release \([[:digit:]]\+\.[[:digit:]]\+\).*" if [ -r /etc/centos-release ]; then + name=$(sed -n -e "s/^\([A-Za-z]\+\).*/\1/p" /etc/centos-release) version=$(sed -n -e "s/${rhel_pat}/\1/p" /etc/centos-release) - dist="CentOS ${version}" + dist="${name} ${version}" elif [ -r /etc/redhat-release ]; then version=$(sed -n -e "s/${rhel_pat}/\1/p" /etc/redhat-release) dist="RHEL ${version}" elif [ -r /etc/os-release ]; then - name=$(sed -n -e 's/"//g' -e 's/^NAME=//p' /etc/os-release) + name=$(sed -n -e 's/"//g' -e 's/ [A-Za-z]*$//' \ + -e 's/^NAME=//p' /etc/os-release) version=$(sed -n -e 's/"//g' -e 's/^VERSION_ID=//p' \ /etc/os-release) dist="${name} ${version}" -- 1.8.3.1