Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1227 tests: mds-survey.sh should check ost's space
[fs/lustre-release.git]
/
lustre
/
tests
/
yaml.sh
diff --git
a/lustre/tests/yaml.sh
b/lustre/tests/yaml.sh
index
4dbdfe7
..
13f69bf
100644
(file)
--- a/
lustre/tests/yaml.sh
+++ b/
lustre/tests/yaml.sh
@@
-18,7
+18,7
@@
yml_nodes_file() {
if [ -f $logdir/shared ]; then
do_rpc_nodes $(comma_list $(nodes_list)) \
if [ -f $logdir/shared ]; then
do_rpc_nodes $(comma_list $(nodes_list)) \
- "yml_node >> $logdir/node.\\\$(hostname).yml"
+ "yml_node >> $logdir/node.\\\$(hostname
-s
).yml"
else
do_rpc_nodes $(comma_list $(nodes_list)) yml_node | split_output
fi
else
do_rpc_nodes $(comma_list $(nodes_list)) yml_node | split_output
fi
@@
-31,13
+31,15
@@
yml_results_file() {
#TestGroup
yml_test_group
#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() {
# 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"
logdir=$1
printf "Build:\n"
@@
-52,8
+54,8
@@
yml_node() {
}
yml_test_group() {
}
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}
# TestGroup information
TEST_USER=${TEST_USER:-$USER}
# TestGroup information
@@
-63,10
+65,13
@@
TestGroup:
testhost: $TEST_HOST
submission: $(date)
user_name: $TEST_USER
testhost: $TEST_HOST
submission: $(date)
user_name: $TEST_USER
-
EOF
}
EOF
}
+yml_code_review() {
+ echo -e $CODE_REVIEW_YAML
+}
+
release() {
if [ -r /etc/lsb-release ]; then
dist=$(grep 'DISTRIB_ID' /etc/lsb-release | sed 's/DISTRIB_ID=//' | head -1)
release() {
if [ -r /etc/lsb-release ]; then
dist=$(grep 'DISTRIB_ID' /etc/lsb-release | sed 's/DISTRIB_ID=//' | head -1)
@@
-85,7
+90,7
@@
release() {
yml_build_info() {
TEST_DISTRO=$(release)
LUSTRE_VERSION=$(lctl lustre_build_version | awk '/Lustre version:/ {print $3}')
yml_build_info() {
TEST_DISTRO=$(release)
LUSTRE_VERSION=$(lctl lustre_build_version | awk '/Lustre version:/ {print $3}')
- LUSTRE_BUILD=$
(sed 's/-.*//' <<<$LUSTRE_VERSION)
+ LUSTRE_BUILD=$
{LUSTRE_BUILD_SOURCE:-$(sed 's/-.*//' <<<$LUSTRE_VERSION)}
cat <<EOF
lbats_build_id: $LBATS_ID
cat <<EOF
lbats_build_id: $LBATS_ID
@@
-103,7
+108,7
@@
yml_node_info()
{
mem=$(awk '/MemTotal:/ {print $2 " " $3}' /proc/meminfo)
cat <<EOF
{
mem=$(awk '/MemTotal:/ {print $2 " " $3}' /proc/meminfo)
cat <<EOF
- node_name: $(hostname)
+ node_name: $(hostname
-s
)
mem_size: $mem
architecture: $(uname -m)
networks:
mem_size: $mem
architecture: $(uname -m)
networks:
@@
-124,17
+129,18
@@
EOF
yml_entities() {
local host
for num in $(seq $MDSCOUNT); do
yml_entities() {
local host
for num in $(seq $MDSCOUNT); do
- host=$(
facet_active_host mds$num
)
+ host=$(
short_hostname $(facet_active_host mds$num)
)
yml_entity "MDS $num" $host >> $logdir/node.$host.yml
done
for num in $(seq $OSTCOUNT); do
yml_entity "MDS $num" $host >> $logdir/node.$host.yml
done
for num in $(seq $OSTCOUNT); do
- host=$(
facet_active_host ost$num
)
+ host=$(
short_hostname $(facet_active_host ost$num)
)
yml_entity "OST $num" $host >> $logdir/node.$host.yml
done
i=1
for host in ${CLIENTS//,/ }; do
yml_entity "OST $num" $host >> $logdir/node.$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_entity "Client $i" $host >> $logdir/node.$host.yml
i=$((i+1))
done
@@
-147,6
+153,7
@@
yml_log_test() {
name: $1
description: $TESTSUITE $1
submission: $(date)
name: $1
description: $TESTSUITE $1
submission: $(date)
+ report_version: 2
SubTests:
EOF
fi
SubTests:
EOF
fi
@@
-154,8
+161,8
@@
EOF
yml_log_test_status() {
cat <<EOF
yml_log_test_status() {
cat <<EOF
- duration: $1
- status: $2
+
duration: $1
+
status: $2
EOF
}
EOF
}