Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Let Scope use these integration test helpers #999

Merged
merged 2 commits into from
Jun 29, 2015

Conversation

paulbellamy
Copy link
Contributor

Since scope has to check out the latest weave release anyway, we may as well use the test helpers from there, and only manage them in one place.

This must be merged, and into a release before: weaveworks/scope#273

WEAVE=../weave
DOCKER_NS=./bin/docker-ns
WEAVE=$DIR/../weave
DOCKER_NS=$DIR/../bin/docker-ns

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

parallel: true
- cd $SRCDIR/test; . ./gce.sh hosts; ./setup.sh:
parallel: true
- cd $SRCDIR/test; . ./gce.sh hosts; ./run_all.sh:

This comment was marked as abuse.

@tomwilkie
Copy link
Contributor

Have you tested this on the weaveworks/weave?

- cd $SRCDIR/test; . ./gce.sh hosts; ./run_all.sh:
- ? >
if [[ -e "/tmp/gce_private_key.json" ]]; then
cd $SRCDIR/integration;

This comment was marked as abuse.

@paulbellamy
Copy link
Contributor Author

Reverted the commit with the modifications to circle.yml, as they're tangential to the main point of this.
Tested on weaveworks/weave at: https://circleci.com/gh/weaveworks/weave/1329

@tomwilkie
Copy link
Contributor

LGTM

paulbellamy added a commit that referenced this pull request Jun 29, 2015
Let Scope use these integration test helpers
@paulbellamy paulbellamy merged commit 8e629d9 into weaveworks:master Jun 29, 2015
@paulbellamy paulbellamy deleted the scope-tests branch June 29, 2015 12:51
@rade rade modified the milestone: 1.1.0 Jul 2, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants