diff --git a/circle.yml b/circle.yml index 6592dc866..61f182437 100644 --- a/circle.yml +++ b/circle.yml @@ -24,7 +24,7 @@ dependencies: - git clone https://github.com/weaveworks/tools.git $TOOLS - sudo apt-get update - sudo apt-get --only-upgrade install tar libpcap0.8-dev - - sudo apt-get install jq + - sudo apt-get install jq pv - curl https://sdk.cloud.google.com | bash - test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD" - go get $WEAVE_REPO/... diff --git a/integration/setup.sh b/integration/setup.sh index 5128b7b82..c0a52a536 100755 --- a/integration/setup.sh +++ b/integration/setup.sh @@ -6,7 +6,8 @@ set -e echo Copying scope images and scripts to hosts for HOST in $HOSTS; do - docker_on $HOST load -i ../scope.tar + SIZE=$(stat --printf="%s" ../scope.tar) + cat ../scope.tar | pv -N "scope.tar" -s $SIZE | $SSH -C $HOST sudo docker load upload_executable $HOST ../scope upload_executable $HOST ../scope /usr/local/scope/bin/scope done