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 <charlie@whamcloud.com>

diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh
index bd08571..8607710 100644 (file)
--- a/lustre/tests/yaml.sh
+++ b/lustre/tests/yaml.sh
@@ -78,13 +78,14 @@ 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}"