LU-18286 tests: auster node.yml labels rocky9 as RHEL

release() assumes a node with /etc/redhat-release is RHEL.
This patch removes reading this file in favor of os-release.
Reading of centos-release (if present) still required as
os-release for centos distros doesn't include minor version.

Test-Parameters: trivial
Signed-off-by: Charlie Olmstead <charlie@whamcloud.com>
Change-Id: I888f8eeacaf843120b2beb134292047b3907a9a6
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56580
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Alex Deiter <adeiter@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh
index 3319fda..9a9a98f 100644 (file)
--- a/lustre/tests/yaml.sh
+++ b/lustre/tests/yaml.sh
@@ -81,9 +81,6 @@ release() {
                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="${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/ [A-Za-z]*$//' \
                        -e 's/^NAME=//p' /etc/os-release)