github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 17:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the build

Browse Source 
* override the weave template and hosts count for gce
* weave gce script wants jq as well now
* build the new weave go test runner
This commit is contained in:
Paul Bellamy
2015-07-30 15:50:56 +01:00
parent 2a22cc29c2
commit 8aede5aaf9
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
integration/200_clustering_test.sh → integration/200_clustering_2_test.sh Normal file → Executable file
View File

3
integration/config.sh
View File

@@ -14,6 +14,9 @@ if [ ! -d "$WEAVE_ROOT" ] ; then
git clone --depth 1 -b master https://$WEAVE_REPO.git "$WEAVE_ROOT"
go get $WEAVE_REPO/...
fi
if [ ! -x "$WEAVE_ROOT/testing/runner/runner" ] ; then
(cd "$WEAVE_ROOT" && make testing/runner/runner)
fi
. "$WEAVE_ROOT/test/config.sh"

2
integration/gce.sh
View File

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