X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fyaml.sh;h=bd08571c31b212869ef77b10a913bd2ebd728c35;hp=c84db5ca38b40a4e69b705a5d98304895ae6bdd8;hb=HEAD;hpb=b00f4d80bf278a103724ab7552a6b77d01c380a0

diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh
index c84db5c..3319fda 100644
--- a/lustre/tests/yaml.sh
+++ b/lustre/tests/yaml.sh
@@ -75,24 +75,21 @@ yml_code_review() {
 }
 
 release() {
-	if [ -r /etc/SuSE-release ]; then
-		name=$(awk '/SUSE/ { printf("%s %s %s %s", $1, $2, $3, $4) }' \
-			/etc/SuSE-release)
-		version=$(sed -n -e 's/^VERSION = //p' /etc/SuSE-release)
-		level=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
-		dist="${name} ${version}.${level}"
+	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="${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)
+		/etc/os-release)
 		dist="${name} ${version}"
-	elif [ -r /etc/system-release ]; then
-		dist=$(awk '/release/ \
-			{ printf("%s %s %s", $1, $2, $3) }' \
-			/etc/system-release)
-	elif [ -r /etc/*-release ]; then
-		dist=$(find /etc/ -maxdepth 1 -name '*release' 2> /dev/null | \
-			sed -e 's/\/etc\///' -e 's/-release//' | head -n1)
 	else
 		dist="UNKNOWN"
 	fi
@@ -112,10 +109,10 @@ cat <<EOF
     architecture: $(uname -m)
     os: $(uname -o)
     os_distribution: $TEST_DISTRO
-    lustre_version: $LUSTRE_VERSION
-    lustre_build: $LUSTRE_BUILD
-    lustre_branch: $LUSTRE_BRANCH
-    lustre_revision: $LUSTRE_REVISION
+    version: $LUSTRE_VERSION
+    build: $LUSTRE_BUILD
+    branch: $LUSTRE_BRANCH
+    revision: $LUSTRE_REVISION
     kernel_version: $(uname -r)
     file_system: ${FILE_SYSTEM:-"NA"}
 EOF
@@ -130,8 +127,12 @@ cat <<EOF
     architecture: $(uname -m)
     networks:
 EOF
-    for nw in $(lctl list_nids | grep -v @lo | cut -f 2 -d '@' | uniq); do
-        printf "        - $nw\n"
+    for nid in $(lctl list_nids | grep -v @lo ); do
+        printf "        - ${nid##*@}\n"
+    done | sort -u
+    echo "    nids:"
+    for nid in $(lctl list_nids | grep -v @lo ); do
+        printf "        - $nid\n"
     done
 }