Merge pull request #570 from weaveworks/testing

Rejig setup.sh to ensure we use the right version of weave.

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

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