Matthias Radestock
20dab1f8fe
Merge branch '1.4'
2016-01-29 12:46:08 +00:00
Bryan Boreham
3297b93edb
Smoke-test 'weave ps' and restarting when using plugin
2016-01-29 12:13:00 +00:00
Bryan Boreham
c0ece16881
Don't need to rm the network here because 'weave reset' does it
2016-01-28 17:55:27 +00:00
Matthias Radestock
d220379ad3
Merge branch '1.4'
2016-01-26 16:57:28 +00:00
Adam Harrison
de17a44f35
Fix fragmentation test
...
The assumptions on which this test was based were violated by the
introduction of fast datapath. A new rule is required to block fast
datapath traffic, to ensure that sleeve is selected for forwarding; the
rules must also be moved from the FORWARD chain to INPUT as the router
now runs in the host netns (NB we use INPUT instead of OUTPUT as the
latter results in sleeve receiving an 'operation not permitted' udpv4
write error when it tries to send a packet that is too big, rather than
the packet just being silently dropped as required)
2016-01-25 10:58:31 +00:00
Adam Harrison
a64435a9a5
Adjust tests to accomodate docker/docker#14012
2016-01-21 17:28:54 +00:00
Matthias Radestock
d5bfc61a73
use hashicorp's wily64 images instead of ubuntu's
...
The latter suffer from https://github.com/mitchellh/vagrant/issues/6653
2016-01-21 11:08:14 +00:00
Adam Harrison
2a2b2da097
Update Vagrant to use Wily 15.10
2016-01-20 09:17:07 +00:00
Tom Wilkie
c098aefed9
Build in a container by default, using go 1.5 and vendored dependancies.
...
- Use submodules for vendoring.
- Don't go clean, now that everything is in .pkg.
- sudo -E as we need the environment variables.
- Install -race version of std so the tests can run without sudo.
- Cache the build image on circle, use the rebuild-image script from tools.
2016-01-13 04:40:18 -08:00
Bryan Boreham
e468399616
Extend the timeout for dead containers to 30 seconds,
...
but remove them if they are destroyed, to reduce starvation
when users are creating and destroying containers quickly.
2016-01-12 14:38:44 +00:00
Bryan Boreham
7985e43e68
Add 'weave restart' command
2016-01-12 14:38:44 +00:00
Bryan Boreham
f84b933d7c
Leave container allocations for a time after death
...
so they will be reclaimed if the container is restarted.
Still cancel pending operations immediately a container dies
2016-01-12 14:38:44 +00:00
Bryan Boreham
604f5c599a
Check if there are any machines to destroy, and stop masking failures
2016-01-07 13:40:34 +00:00
Bryan Boreham
bab758ebf9
Revert "Launch the proxy via unix socket in last test"
...
- since we won't now be copying $DOCKER_HOST
This reverts commit d8cfbc4e08 .
2015-12-22 17:01:04 +00:00
Adam Harrison
7015ab8717
Merge pull request #1780 from weaveworks/1748-no-with-dns
...
Remove WITH_DNS variable from weave script
2015-12-16 15:59:24 +00:00
Bryan Boreham
67195bc9f3
Remove WITH_DNS variable and deprecate --with-dns option to 'weave run'
2015-12-16 14:55:35 +00:00
Adam Harrison
ce18509aa7
Merge pull request #1781 from weaveworks/1754-no-with-dns
...
Remove --with-dns option from proxy
2015-12-16 14:02:30 +00:00
Bryan Boreham
3043217b2c
Extend --no-multicast-route test to plugin
2015-12-16 12:17:25 +00:00
Bryan Boreham
d8cfbc4e08
Launch the proxy via unix socket in last test
...
- proxy copies permissions from $DOCKER_HOST socket if available, so in
this case it was not accessible because we were booting via a TCP
socket
2015-12-16 10:14:44 +00:00
Paul Bellamy
88fad251aa
add test for proxy against docker on non-standard unix socket
...
Means we need to rebuild the gce images
(also small improvement re tmpdir)
2015-12-16 10:14:15 +00:00
Bryan Boreham
1539009362
Simple smoke-test for 'local' plugin network
2015-12-15 16:47:33 +00:00
Bryan Boreham
9542b77a34
Extend smoke-test framework for weaveplugin
2015-12-15 16:47:33 +00:00
Bryan Boreham
c973808b20
Merge pull request #1758 from weaveworks/issues/82-optional-encryption
...
Make encryption optional; fixes #82 , #1788 . LGTM.
2015-12-15 15:23:58 +00:00
Adam Harrison
85d4b1f137
Smoke test trusted subnets
2015-12-14 12:13:16 +00:00
Adam Harrison
96f69583e7
Smoke test --no-multicast-route
2015-12-14 11:53:06 +00:00
Bryan Boreham
68d6c262d1
Remove --with-dns option from proxy
2015-12-12 14:12:39 +00:00
Adam Harrison
d0be36dc9b
Merge branch '1.3'
...
Conflicts:
Makefile
2015-12-08 16:53:47 +00:00
Bryan Boreham
c981cff450
Move build of test/tls program into Makefile so it builds in the build container
2015-12-08 16:14:53 +00:00
Paul Bellamy
cd7c88e5a5
[proxy] Symlink sockets to /var/run/weave/weave.sock from inside the proxy
...
We copy docker.sock owner to symlinks. Permissions are not copied,
because the permissions will inherit from the target.
use versioned exec image to create symlinks
2015-11-30 15:45:30 +00:00
Paul Bellamy
0f9b117744
Connect to gce boxes as vagrant so we can access docker unix socket
2015-11-20 16:54:41 +00:00
Paul Bellamy
3bae4b0d93
Revert "Automatically symlink /var/run/*.sock sockets to /var/run/weave/*.sock"
2015-11-20 16:23:40 +00:00
Adam Harrison
1432bd7a81
Merge pull request #1696 from weaveworks/1694-symlink-into-var-run
...
Automatically symlink /var/run/*.sock sockets to /var/run/weave/*.sock
2015-11-20 16:23:12 +00:00
Bryan Boreham
bbf26fc3e8
Raise minimum Docker version to 1.6 to address #1683
2015-11-20 10:44:45 +00:00
Paul Bellamy
33648b083c
SSH into test vms on gce as 'vagrant' user
2015-11-19 14:10:52 +00:00
Paul Bellamy
77bc22baf5
[proxy] Auto-symlink /var/run/*.sock in from /var/run/weave/*.sock
...
Avoids the obscure warning for users
2015-11-17 17:25:21 +00:00
Paul Bellamy
f57988761c
Revert "Revert "Merge pull request #1580 from weaveworks/1579-launch-proxy-mount-h""
...
This reverts commit 7987d09438 .
2015-11-17 17:15:28 +00:00
Adam Harrison
7987d09438
Revert "Merge pull request #1580 from weaveworks/1579-launch-proxy-mount-h"
...
This reverts commit 262352f8bb , reversing
changes made to 312691376a due to a bug
whereby `weave env` returns a unix domain socket with an incorrect path.
This change will be superceeded by #1694 .
2015-11-17 16:28:31 +00:00
Paul Bellamy
d80e72dfcd
[proxy] dynamically mount -H dirs into the proxy when launching
...
This lets you use -H unix://*.sock outside /var/run/weave. Using a
socket directly in /var/run (i.e. /var/run/foo.sock), will reintroduce
the bug with namespaces not being GCed, so that is a warning.
2015-11-17 09:40:34 +00:00
Bryan Boreham
de802f9d76
Work round docker-py assuming busybox is present ( https://github.com/docker/docker-py/issues/852 )
2015-11-13 11:44:08 +00:00
Bryan Boreham
804e6ba586
Cope with changes in docker-py structure.
...
Tests are now in a different directory,
and get sharded by module rather than individually.
2015-11-13 11:08:57 +00:00
Adam Harrison
0661ccdea9
Revert "Revert "Disable restart of docker""
...
This reverts commit 76db732f1b .
2015-11-11 10:10:17 +00:00
Adam Harrison
76db732f1b
Revert "Disable restart of docker"
...
This reverts commit a400a3dd09 .
2015-11-10 10:24:58 +00:00
Bryan Boreham
17c835e672
Compress weave.tar to save upload time
2015-11-09 17:18:58 +00:00
Bryan Boreham
499d6312b7
Don't need --add-host except in non-FDP case because we put the
...
mappings in the outer /etc/hosts
2015-11-09 17:18:58 +00:00
Bryan Boreham
20d5903696
Update test template name to pull in new Docker version
2015-11-09 17:18:57 +00:00
Matthias Radestock
39b0357517
Merge branch '1.2'
2015-11-08 11:04:48 +00:00
Matthias Radestock
19f89f7122
remove duplicate test
...
this is already covered in dns_fallback_test
2015-11-07 07:30:53 +00:00
Bryan Boreham
a400a3dd09
Disable restart of docker
2015-11-05 14:20:38 +00:00
Bryan Boreham
549fd5fe29
Merge branch '1.2'
2015-11-05 11:30:53 +00:00
Bryan Boreham
0ab5c65185
Merge pull request #1630 from weaveworks/issues/1588-improve-proxy-restart-reattach-test
...
Improve proxy restart reattach test reliability
2015-11-05 11:25:31 +00:00