X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fyaml.sh;h=202fed36894657841e50245070930a474ba01fba;hp=7269cb8a109923240a7be1a57a9f3b267568dc71;hb=f44fe5abbc74ca79790c100a30193ded1ef1e6c9;hpb=4d96e960d574387e8ac4a31249ef1d30c859480b

diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh
index 7269cb8..202fed3 100644
--- a/lustre/tests/yaml.sh
+++ b/lustre/tests/yaml.sh
@@ -73,13 +73,23 @@ yml_code_review() {
 }
 
 release() {
-	if [ -r /etc/lsb-release ]; then
-		dist=$(sed -ne '/^DISTRIB_ID/s/DISTRIB_ID=//p' /etc/lsb-release)
-	elif [ -r /etc/redhat-release ]; then
-		dist=$(awk '/release/ { printf("%s %s %s", $1, $2, $3) }' \
-			/etc/redhat-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}"
+	elif [ -r /etc/os-release ]; then
+		name=$(sed -n -e 's/"//g' -e 's/^NAME=//p' /etc/os-release)
+		version=$(sed -n -e 's/"//g' -e 's/^VERSION_ID=//p' \
+			/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 |
+		dist=$(find /etc/ -maxdepth 1 -name '*release' 2> /dev/null | \
 			sed -e 's/\/etc\///' -e 's/-release//' | head -n1)
 	else
 		dist="UNKNOWN"
@@ -89,10 +99,10 @@ release() {
 }
 
 yml_build_info() {
-    local TEST_DISTRO=$(release)
-    local LUSTRE_VERSION=$(lctl lustre_build_version | awk '/Lustre version:/ {print $3}')
-    local LUSTRE_BUILD=${LUSTRE_BUILD_SOURCE:-$(sed 's/-.*//' <<<$LUSTRE_VERSION)}
-    local FILE_SYSTEM=$(node_fstypes $(hostname -s))
+	local TEST_DISTRO=$(release)
+	local LUSTRE_VERSION=$(lustre_build_version)
+	local LUSTRE_BUILD=${LUSTRE_BUILD_SOURCE:-$LUSTRE_VERSION}
+	local FILE_SYSTEM=$(node_fstypes $(hostname -s))
 
 cat <<EOF
     lbats_build_id: $LBATS_ID