diff --git a/bin/circle-test-smoke b/bin/circle-test-smoke index 4164e20a..9e59d881 100755 --- a/bin/circle-test-smoke +++ b/bin/circle-test-smoke @@ -9,5 +9,7 @@ if [ -n "$TEST_AND_PUBLISH" ] ; then cd $SRCDIR/test eval $(./gce.sh hosts) export COVERAGE=true + export WEAVE_NET_SANITY_CHECKS_FILES="/tmp/weave_net_sanity_check_*.log" ./run_all.sh + cp $WEAVE_NET_SANITY_CHECKS_FILES $CIRCLE_ARTIFACTS fi diff --git a/test/sanity_check.sh b/test/sanity_check.sh index 737f9f6e..657bdf71 100755 --- a/test/sanity_check.sh +++ b/test/sanity_check.sh @@ -5,6 +5,7 @@ set -e begin=$(date +%s) +sanity_checks_files=${WEAVE_NET_SANITY_CHECKS_FILES:-"/tmp/weave_net_sanity_check_*.log"} whitely echo Ping each host from the other @@ -14,12 +15,17 @@ whitely echo Ping each host from the other function check_ping() { local output=$(run_on $1 $PING $2) local status=$? - echo $output + echo "$output" >> "${sanity_checks_files/\*/$1}" return $status } pids="" for host in $HOSTS; do + cat >> "${sanity_checks_files/\*/$host}" <> "${sanity_checks_files/\*/$1}" << EOF +# ===================================== +# Host Version Info: $1 +# ===================================== # docker version $docker_version + # docker info $docker_info -# weave version + +# docker inspect -f {{.Created}} weaveworks/weave: $docker_weave_version + +# weave version $weave_version EOF }