Paul Bellamy
1d1ebc103d
Merge remote-tracking branch 'upstream/1.0'
2015-08-04 14:29:12 +01:00
Paul Bellamy
eee13e7dd9
Merge pull request #1253 from weaveworks/1241-no-command-specified
...
[proxy] Handle case where no command is specified.
2015-08-04 13:11:35 +01:00
Paul Bellamy
7cc53c4c68
[proxy] Handle case where no command is specified.
...
The docker daemon can't do this because we set /w/w.
2015-08-04 12:32:42 +01:00
Matthias Radestock
9c22066bdb
Merge pull request #1256 from weaveworks/1245-dns-loadbalancing
...
Add note to explain DNS shuffle effects.
Fixes #1245 .
2015-08-04 12:22:23 +01:00
Tom Wilkie
f241e15ec1
Review feedback
2015-08-04 11:00:32 +00:00
Tom Wilkie
881ece3553
Add note to explain dns shuffle effects.
2015-08-04 10:47:36 +00:00
Michael Bridgen
281bf02871
Merge branch 'pr1254'
2015-08-03 15:26:08 +01:00
Michael Bridgen
778038fdd3
Merge branch 'fix-dotted-imports-for-log' of https://github.com/dpw/weave into pr1254
2015-08-03 14:29:53 +01:00
David Wragg
e7ee72836d
Log -> log
2015-08-03 14:13:24 +01:00
David Wragg
31c0506b85
Eliminate dotted imports of common for the sake of Log
2015-08-03 14:07:16 +01:00
David Wragg
7d6f85424c
Move OnOff into router.go
2015-08-03 14:06:23 +01:00
Tom Wilkie
ca89cfee3d
Merge pull request #1250 from paulbellamy/testrunner-summarize-fails
...
Some usability tweaks to the test runner
2015-07-31 12:36:50 +01:00
Paul Bellamy
5a37f652c2
add -v to testrunner, and less output in happy path
2015-07-31 12:25:50 +01:00
Paul Bellamy
cc7b781bb3
have testrunner summarize failed tests so they are easier to find
2015-07-31 12:12:33 +01:00
Paul Bellamy
55051f0194
Merge remote-tracking branch 'upstream/1.0'
2015-07-31 11:01:19 +01:00
Paul Bellamy
78e0e79b26
Merge pull request #1238 from weaveworks/1232-weavewait-image
...
[proxy] only mount /w into weavewaited containers
2015-07-31 10:57:26 +01:00
Paul Bellamy
b7e8938ab4
scope the test runner call so scope works
2015-07-31 10:49:21 +01:00
Matthias Radestock
f8327c3c6c
expand test coverage to unicast relaying
...
by way of an ipam space request from host3 to host1, via host2.
2015-07-30 20:38:00 +01:00
Paul Bellamy
e3851e6e55
Merge pull request #1246 from weaveworks/gce-parameterize
...
parameterize test/gce.sh so scope can override TEMPLATE_NAME and NUM_HOSTS
2015-07-30 16:18:59 +01:00
Matthias Radestock
6a136eebb2
make parallel test running work locally
...
@tomwilkie assures me this change won't break CircleCI. We shall see.
This now works for me:
make clean
make COVERAGE=true
COVERDIR=test/coverage SLOW=true ./test/units.sh
cd test
./setup.sh
COVERAGE=true PARALLEL=true ./run_all.sh
./gen_coverage_reports.sh
2015-07-30 15:57:49 +01:00
Paul Bellamy
9396c046cd
parameterize test/gce.sh so scope can override TEMPLATE_NAME and NUM_HOSTS
2015-07-30 15:48:22 +01:00
Paul Bellamy
4958b8d37a
[proxy] Mount /w from the host for weavewaited containers
...
We set it at container create. Had tried also setting it at start, but
it seems to cause weird behaviour, and there is no way to do it from the
CLI.
2015-07-30 15:11:03 +01:00
Paul Bellamy
e2389a4061
[proxy] Don't try to attach if container failed to start
2015-07-30 13:31:47 +01:00
Paul Bellamy
dccd199369
Merge pull request #1242 from weaveworks/1239-600-docker-py
...
Shard 600_proxy_docker_py into 4.
2015-07-30 13:14:54 +01:00
Tom Wilkie
a87be89095
Typos. Honestly
2015-07-30 11:07:17 +00:00
Tom Wilkie
5c9a13d343
Shard 600_proxy_docker_py into 4.
2015-07-30 10:38:02 +00:00
Tom Wilkie
bfe07fc71a
Give each shard 5 VMs
2015-07-30 10:32:16 +00:00
Tom Wilkie
fa95b67c92
Add summary to bottom of test runner output.
...
Also, don't sort tests by #hosts when run sequentially, and fix typo in run_all.sh.
Fixes #1240
2015-07-30 10:29:05 +00:00
Adam Harrison
728203912e
.gitignore Vim recovery files
2015-07-30 10:53:59 +01:00
Paul Bellamy
27289e7b7b
Merge pull request #1236 from weaveworks/1169-frugal-frugal-frugal
...
Run integration tests in parallel when possible.
2015-07-30 10:16:39 +01:00
Tom Wilkie
669a0db528
Run integration tests in parallel when possible.
2015-07-29 17:28:58 +00:00
Paul Bellamy
4da999ba86
Merge pull request #1235 from weaveworks/gce
...
Improve CI run time
2015-07-29 17:38:30 +01:00
Paul Bellamy
5e9bd5424a
Removed all the imports from "code.google.com"
2015-07-29 15:47:02 +01:00
Tom Wilkie
3bffd871b8
Merge pull request #1230 from weaveworks/1154-proxy-coverage
...
Add coverage to proxy for integration tests.
2015-07-29 13:24:21 +01:00
Adam Harrison
2d450ac39d
Merge pull request #1225 from weaveworks/21-dns-listen-addr
...
Allow users to set dns listen address
2015-07-29 13:18:10 +01:00
Tom Wilkie
6fe69590c4
Add coverage to proxy for integration tests.
2015-07-29 12:06:29 +00:00
Tom Wilkie
4df3d7f150
Reduce the amount of parallelism in the ipam tests
2015-07-29 10:13:02 +00:00
Tom Wilkie
51128a6705
Parallelise the copying of /etc/hosts.
2015-07-29 09:58:51 +00:00
Tom Wilkie
e7676979ee
Parallelise the copying of imaages etc
2015-07-29 09:58:05 +00:00
Tom Wilkie
da36c78942
Reduce the number of times gcs.sh ssh's into the VMs
2015-07-29 09:41:57 +00:00
Matthias Radestock
77358140d9
Merge pull request #1219 from squaremo/driveby
...
Remove misleading comment and lowercase deniedBy
2015-07-28 18:09:01 +01:00
Adam Harrison
1701bc3e92
Merge branch '1.0'
...
Conflicts:
weave
2015-07-28 18:06:44 +01:00
Matthias Radestock
ba0ffd225e
Merge pull request #1231 from weaveworks/issues/1229-explicitly-set-docker-bridge-mac
...
Enforce docker bridge address assignment type on launch
Fixes #1229 .
2015-07-28 17:59:46 +01:00
Adam Harrison
a14d4d9f8e
Enforce docker bridge address assignment type on launch
2015-07-28 17:51:48 +01:00
Tom Wilkie
db6ee9954c
Allow users to set dns listen address so we can run the weave router in the host net namespace.
2015-07-28 14:49:09 +00:00
Paul Bellamy
792c4c8de4
Merge pull request #1227 from weaveworks/gce-gc
...
Extend scheduler to periodically garbage collect stranded VMs
2015-07-28 15:35:28 +01:00
Matthias Radestock
820307dd4e
Merge pull request #1228 from weaveworks/1030-150-connect-forget
...
Don't init the ring if the address is not in range.
Fixes #1030 .
2015-07-28 15:29:16 +01:00
Tom Wilkie
88144ac7f8
Review feedback
2015-07-28 14:16:38 +00:00
Tom Wilkie
da7ac78694
Don't try and init the ring if the IP address is not in our range.
2015-07-28 14:12:42 +00:00
Tom Wilkie
10dbd9ad4c
Merge pull request #1224 from weaveworks/1203_proper_mock_gossip
...
proper mock periodic gossip
2015-07-28 13:29:20 +01:00
Paul Bellamy