From a61800be0f14093b7be6f1ea22580135e52b657e Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Sat, 17 Oct 2015 13:28:56 +0000 Subject: [PATCH] Rejig setup.sh to ensure we use the right version of weave. --- integration/config.sh | 5 +++-- integration/setup.sh | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/integration/config.sh b/integration/config.sh index 274813ab7..3c674a206 100644 --- a/integration/config.sh +++ b/integration/config.sh @@ -10,13 +10,14 @@ export HOSTS : ${WEAVE_REPO:=github.com/weaveworks/weave} : ${WEAVE_ROOT:="$(go list -e -f {{.Dir}} $WEAVE_REPO)"} -WEAVE="./weave" -SCOPE="../scope" RUNNER="$WEAVE_ROOT/testing/runner/runner" [ -x "$RUNNER" ] || (echo "Could not find weave test runner at $RUNNER." >&2 ; exit 1) . "$WEAVE_ROOT/test/config.sh" +WEAVE="./weave" +SCOPE="../scope" + scope_on() { local host=$1 shift 1 diff --git a/integration/setup.sh b/integration/setup.sh index b16b475f6..5128b7b82 100755 --- a/integration/setup.sh +++ b/integration/setup.sh @@ -12,17 +12,20 @@ for HOST in $HOSTS; do done echo Installing weave +# Download the latest released weave script locally, +# for use by weave_on +curl -sL git.io/weave -o ./weave +chmod a+x ./weave for HOST in $HOSTS; do run_on $HOST "sudo curl -sL git.io/weave -o /usr/local/bin/weave" run_on $HOST "sudo chmod a+x /usr/local/bin/weave" + weave_on $HOST setup done echo Prefetching Images for HOST in $HOSTS; do - weave_on $HOST setup docker_on $HOST pull peterbourgon/tns-db docker_on $HOST pull alpine docker_on $HOST pull nginx done -curl -sL git.io/weave -o ./weave