From 04cc4edf263fb1d8cc4fc306b89e699f667e245b Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Wed, 14 Dec 2016 18:25:47 +0000 Subject: [PATCH] Parallelise sanity checks in order to speed them up. --- test/sanity_check.sh | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/test/sanity_check.sh b/test/sanity_check.sh index 66cbac49..e0b679bc 100755 --- a/test/sanity_check.sh +++ b/test/sanity_check.sh @@ -5,23 +5,42 @@ set -e whitely echo Ping each host from the other + for host in $HOSTS; do for other in $HOSTS; do - [ $host = $other ] || run_on $host $PING $other + if [ "$host" != "$other" ]; then + run_on $host $PING $other & + pids="$pids $!" + fi done done +for pid in $pids; do wait $pid; done +unset pids + whitely echo Check we can reach docker +function check_docker() { + docker_version=$(docker_on $1 version) + docker_info=$(docker_on $1 info) + docker_weave_version=$(docker_on $1 inspect -f {{.Created}} weaveworks/weave:${WEAVE_VERSION:-latest}) + weave_version=$(weave_on $1 version) + cat << EOF + +Host Version Info: $1 +===================================== +# docker version +$docker_version +# docker info +$docker_info +# weave version +$docker_weave_version +$weave_version +EOF +} + for host in $HOSTS; do - echo - echo Host Version Info: $host - echo ===================================== - echo "# docker version" - docker_on $host version - echo "# docker info" - docker_on $host info - echo "# weave version" - docker_on $host inspect -f {{.Created}} weaveworks/weave:${WEAVE_VERSION:-latest} - weave_on $host version + check_docker $host & + pids="$pids $!" done +for pid in $pids; do wait $pid; done