Use gce.sh, config.sh etc from tools.

circle.yml

@@ -12,8 +12,6 @@ machine:
     PATH: $PATH:$HOME/.local/bin
     CLOUDSDK_CORE_DISABLE_PROMPTS: 1
     SCOPE_UI_BUILD: $HOME/docker/scope_ui_build.tar
-    WEAVE_REPO: github.com/weaveworks/weave
-    WEAVE_ROOT: /home/ubuntu/src/github.com/weaveworks/weave
 
 dependencies:
   cache_directories:
@@ -22,12 +20,10 @@ dependencies:
     - "sudo apt-get update && sudo apt-get install jq pv"
     - curl https://sdk.cloud.google.com | bash
     - test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD"
-    - mkdir -p $GOPATH/src/$WEAVE_REPO; git clone http://github.com/weaveworks/weave $GOPATH/src/$WEAVE_REPO
     - make deps
     - "mkdir -p $(dirname $SRCDIR) && cp -r $(pwd)/ $SRCDIR"
     - "cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc .babelrc && touch $SRCDIR/.scope_ui_build.uptodate"
     - "cd $SRCDIR/backend; ../tools/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh && touch $SRCDIR/.scope_backend_build.uptodate"
-    - "make -C $SRCDIR/tools/runner && mkdir -p $WEAVE_ROOT/tools/runner && cp $SRCDIR/tools/runner/runner $WEAVE_ROOT/tools/runner"
     - cd $SRCDIR/integration; ./gce.sh make_template:
         parallel: false
 

integration/config.sh

@@ -7,10 +7,7 @@ set -e
 export SSH_DIR="$PWD"
 export HOSTS
 
-: ${WEAVE_REPO:=github.com/weaveworks/weave}
-: ${WEAVE_ROOT:="$(go list -e -f {{.Dir}} $WEAVE_REPO)"}
-
-. "$WEAVE_ROOT/test/config.sh"
+. "../tools/integration/config.sh"
 
 WEAVE="./weave"
 SCOPE="../scope"

integration/gce.sh

@@ -6,5 +6,5 @@ set -e
 
 export PROJECT=scope-integration-tests
 export TEMPLATE_NAME="test-template-4"
-export NUM_HOSTS=3
-. "$WEAVE_ROOT/test/gce.sh" "$@"
+export NUM_HOSTS=2
+. "../tools/integration/gce.sh" "$@"

integration/run_all.sh

@@ -4,4 +4,4 @@ set -e
 
 . ./config.sh
 
-NO_SCHEDULER=1 $WEAVE_ROOT/test/run_all.sh "$@"
+NO_SCHEDULER=1 ../tools/integration/run_all.sh "$@"

integration/setup.sh

@@ -8,8 +8,6 @@ echo Copying scope images and scripts to hosts
 for HOST in $HOSTS; do
     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
 
 setup_host() {