X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftests%2Fyaml.sh;h=c84db5ca38b40a4e69b705a5d98304895ae6bdd8;hb=2b905746ee3b5d9dbafcdb1af5930aea18120a7b;hp=689f474a14dfd30aa22b9015504b007dcaea6b9d;hpb=e4cf956f93a4384d19ea73e601a6651710703492;p=fs%2Flustre-release.git

diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh
index 689f474..c84db5c 100644
--- a/lustre/tests/yaml.sh
+++ b/lustre/tests/yaml.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 
 #
 # Shell routines for logging results to a yaml file.
@@ -17,10 +17,10 @@ yml_nodes_file() {
     export logdir=$1
 
     if [ -f $logdir/shared ]; then
-        do_rpc_nodes $(comma_list $(nodes_list)) \
-            "yml_node >> $logdir/node.\\\$(hostname).yml"
+        do_rpc_nodes $(comma_list $(all_nodes)) \
+            "yml_node >> $logdir/node.\\\$(hostname -s).yml"
     else
-        do_rpc_nodes $(comma_list $(nodes_list)) yml_node | split_output
+        do_rpc_nodes $(comma_list $(all_nodes)) yml_node | split_output
     fi
     yml_entities
 }
@@ -31,13 +31,15 @@ yml_results_file() {
     #TestGroup
     yml_test_group
 
+    #CodeReview
+    yml_code_review
+
     # Tests
     printf "Tests:\n"
 }
 
 # Called on the node for which we the info is needed.
 yml_node() {
-    local node=$(hostname)
     logdir=$1
 
     printf "Build:\n"
@@ -52,9 +54,10 @@ yml_node() {
 }
 
 yml_test_group() {
-    TEST_GROUP=${TEST_GROUP:-"acc-sm-$(hostname)"}
-    TEST_HOST=${TEST_HOST:-$(hostname)}
+    TEST_GROUP=${TEST_GROUP:-"acc-sm-$(hostname -s)"}
+    TEST_HOST=${TEST_HOST:-$(hostname -s)}
     TEST_USER=${TEST_USER:-$USER}
+    TEST_PROJECT=${TEST_PROJECT:-"LUSTRE"}
 
     # TestGroup information
     cat <<EOF
@@ -63,29 +66,45 @@ TestGroup:
     testhost: $TEST_HOST
     submission: $(date)
     user_name: $TEST_USER
-
+project: $TEST_PROJECT
 EOF
 }
 
-release() {
-   if [ -r /etc/lsb-release ]; then
-      dist=$(grep 'DISTRIB_ID' /etc/lsb-release | sed 's/DISTRIB_ID=//' | head -1)
-   elif [ -r /etc/redhat-release ]; then
-       dist=$(awk '/release/ { printf("%s %s %s", $1, $2, $3)}' /etc/redhat-release)
-   elif [ -r /etc/*-release ]; then
-       dist=$(find /etc/ -maxdepth 1 -name '*release' 2> /dev/null | \
-           sed -e 's/\/etc\///' -e 's/-release//' | head -1)
-   else
-       dist="UNKNOWN"
-   fi
+yml_code_review() {
+    echo -e $CODE_REVIEW_YAML
+}
 
-   echo $dist
+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 | \
+			sed -e 's/\/etc\///' -e 's/-release//' | head -n1)
+	else
+		dist="UNKNOWN"
+	fi
+
+	echo $dist
 }
 
 yml_build_info() {
-    TEST_DISTRO=$(release)
-    LUSTRE_VERSION=$(lctl lustre_build_version | awk '/Lustre version:/ {print $3}')
-    LUSTRE_BUILD=$(sed 's/-.*//' <<<$LUSTRE_VERSION)
+	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
@@ -95,7 +114,10 @@ cat <<EOF
     os_distribution: $TEST_DISTRO
     lustre_version: $LUSTRE_VERSION
     lustre_build: $LUSTRE_BUILD
+    lustre_branch: $LUSTRE_BRANCH
+    lustre_revision: $LUSTRE_REVISION
     kernel_version: $(uname -r)
+    file_system: ${FILE_SYSTEM:-"NA"}
 EOF
 }
 
@@ -103,7 +125,7 @@ yml_node_info()
 {
     mem=$(awk '/MemTotal:/ {print $2 " " $3}' /proc/meminfo)
 cat <<EOF
-    node_name: $(hostname)
+    node_name: $(hostname -s)
     mem_size: $mem
     architecture: $(uname -m)
     networks:
@@ -122,22 +144,43 @@ EOF
 }
 
 yml_entities() {
-    local host
-    for num in $(seq $MDSCOUNT); do
-        host=$(facet_active_host mds$num)
-        yml_entity "MDS $num" $host >> $logdir/node.$host.yml
-    done
-
-    for num in $(seq $OSTCOUNT); do
-        host=$(facet_active_host ost$num)
-        yml_entity "OST $num" $host >> $logdir/node.$host.yml
-    done
-
-    i=1
-    for host in ${CLIENTS//,/ }; do
-        yml_entity "Client $i" $host >> $logdir/node.$host.yml
-        i=$((i+1))
-    done
+	local host
+	local f_host
+	local i
+
+	if ! combined_mgs_mds; then
+		host=$(short_hostname $(facet_active_host mgs))
+		f_host=$(short_hostname $(facet_passive_host mgs))
+
+		yml_entity "MGS" $host >> $logdir/node.$host.yml
+		[[ -n $f_host ]] &&
+			yml_entity "MGS" $f_host >> $logdir/node.$f_host.yml
+	fi
+
+	for i in $(seq $MDSCOUNT); do
+		host=$(short_hostname $(facet_active_host mds$i))
+		f_host=$(short_hostname $(facet_passive_host mds$i))
+
+		yml_entity "MDS $i" $host >> $logdir/node.$host.yml
+		[[ -n $f_host ]] &&
+			yml_entity "MDS $i" $f_host >> $logdir/node.$f_host.yml
+	done
+
+	for i in $(seq $OSTCOUNT); do
+		host=$(short_hostname $(facet_active_host ost$i))
+		f_host=$(short_hostname $(facet_passive_host ost$i))
+
+		yml_entity "OST $i" $host >> $logdir/node.$host.yml
+		[[ -n $f_host ]] &&
+			yml_entity "OST $i" $f_host >> $logdir/node.$f_host.yml
+	done
+
+	i=1
+	for host in ${CLIENTS//,/ }; do
+		host=$(short_hostname $host)
+		yml_entity "Client $i" $host >> $logdir/node.$host.yml
+		i=$((i+1))
+	done
 }
 
 yml_log_test() {
@@ -147,6 +190,7 @@ yml_log_test() {
         name: $1
         description: $TESTSUITE $1
         submission: $(date)
+        report_version: 2
         SubTests:
 EOF
     fi
@@ -154,22 +198,30 @@ EOF
 
 yml_log_test_status() {
     cat <<EOF
-    duration: $1
-    status: $2
+        duration: $1
+        status: $2
 EOF
 }
 
-yml_log_sub_test() {
+yml_log_sub_test_begin() {
     cat <<EOF
         -
             name: $1
-            status: $2
-            duration: $3
-            return_code: $4
 EOF
-    shift 4
-    printf "            error: "
-    echo $@
+}
+
+yml_log_sub_test_end() {
+    cat <<EOF
+            status: $1
+            duration: $2
+            return_code: $3
+EOF
+    shift 3
+    if [ -z "$*" ]; then
+        printf '            error:\n'
+    else
+        printf '            error: "%q"\n' "$*"
+    fi
 }
 
 yml_log_sub_test_log() {