github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build new test VM (to pickup latest Docker version).

Browse Source
This commit is contained in:
Tom Wilkie
2016-01-04 15:52:10 +00:00
parent 22247130d3
commit abebb0f197
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
circle.yml
View File

@@ -18,7 +18,7 @@ machine:
dependencies: dependencies:
cache_directories: cache_directories:
- "~/docker" - "~/docker"
post: override:
- "sudo apt-get update && sudo apt-get install jq pv" - "sudo apt-get update && sudo apt-get install jq pv"
- curl https://sdk.cloud.google.com | bash - curl https://sdk.cloud.google.com | bash
- test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD" - test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD"
@@ -28,6 +28,8 @@ dependencies:
- "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/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" - "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" - "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
test: test:
override: override:

2
integration/gce.sh
View File

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