Bryan Boreham
bbf26fc3e8
Raise minimum Docker version to 1.6 to address #1683
2015-11-20 10:44:45 +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
Matthias Radestock
df68f7dcb9
Merge branch '1.2'
2015-11-03 17:56:36 +00:00
Matthias Radestock
e95e3cc29d
Merge pull request #1624 from weaveworks/1593-more-peers
...
Better choice of peers for IPAM to transfer ownership to on `weave reset`
Fixes #1593 .
2015-11-03 17:55:40 +00:00
Adam Harrison
94984df047
Merge branch '1.2'
2015-11-03 16:57:15 +00:00
Adam Harrison
06eaac8690
Don't assert ethwe carrier via the proxy
...
The test script runs commands inside containers via docker exec to
ensure the ethwe carrier is up. We must not run these commands via the
proxy because it will interpose weavewait, which will block forever if
attachment has failed (e.g. due to #1556 ).
2015-11-03 15:42:37 +00:00
Adam Harrison
6b9e8816d1
Wait for proxy to become available after docker is restarted
2015-11-03 15:33:37 +00:00
Bryan Boreham
cf9f715a28
Merge branch '1.2'
2015-11-03 15:31:51 +00:00
Bryan Boreham
08e043fea7
Always add 'weave expose -h' argument to DNS, and add smoke-test for this also
2015-11-03 15:23:28 +00:00
Adam Harrison
4a6a46fd7b
Merge pull request #1627 from tomwilkie/mv-scheduler
...
Move scheduler to build-tools.
2015-11-03 14:44:52 +00:00
Tom Wilkie
c02691a70c
Move scheduler to build-tools.
2015-11-03 14:38:42 +00:00
Bryan Boreham
27c5f5f49f
Fix title of test
2015-11-03 12:03:00 +00:00
Paul Bellamy
ec5a1a3977
When container is started in host (or container) networkMode, we mount a noop weavewait, so it can continue
...
review feedback
2015-11-03 10:18:05 +00:00
Bryan Boreham
b3cda39b0b
Let IPAM pick any peer we know about to transfer ownership to, when shutting down
2015-11-02 18:34:58 +00:00
Tom Wilkie
203a3cfdd1
Remove test runner; it now live in build-tools.git
2015-10-23 13:02:00 +00:00
Bryan Boreham
383c3769aa
Try en even bigger sleep
2015-10-22 12:19:57 +01:00
Bryan Boreham
acdc70f72a
Merge pull request #1560 from weaveworks/1542-proxy-bug-weave-not-running
...
LGTM. Fixes #1542
2015-10-22 10:19:32 +01:00
Paul Bellamy
63339c026d
[proxy] return errors when attaching new containers
...
I had implemented this with a promise, but was informed that as
waitForStart is only called once, we are safe to just put the error into
the channel.
2015-10-21 13:05:05 +01:00
Adam Harrison
40922b88f7
Reorder inspect template to work around docker/docker#17026
2015-10-21 12:39:55 +01:00
Adam Harrison
c5f5d4543e
Merge pull request #1518 from weaveworks/401-reattach-weave2
...
Get proxy to re-attach weave router if it restarts
2015-10-20 15:31:13 +01:00
Paul Bellamy
526c9c3d73
Add test for {"HostConfig":{}} overriding previous settings, but still connecting to weave
2015-10-20 11:26:29 +01:00
Bryan Boreham
119d87b795
Extract repeated test into function
2015-10-20 11:26:29 +01:00
Bryan Boreham
81c9b3f327
Check that HostConfig parameters supplied on /start are passed to Docker,
...
also what happens when you supply a HostConfig named HostConfig
2015-10-20 11:26:29 +01:00
Bryan Boreham
faf94b033d
Extend test to check we don't overwrite HostConfig
2015-10-20 11:25:06 +01:00
Bryan Boreham
26d43f193e
Move docker restart test above the place where we stop part of weave
2015-10-20 07:07:04 +00:00
Bryan Boreham
20ac0edda8
Try a bigger sleep to get Docker restarted
2015-10-19 15:46:48 +00:00
Bryan Boreham
a87cc5c3b1
Get the proxy to re-attach the weave router if it sees it restart
2015-10-19 15:46:47 +00:00
Matthias Radestock
db9229f485
Merge pull request #1551 from weaveworks/1547-proxy-restart-no-kill-containers
...
Proxy restart shouldn't kill containers
Fixes #1547 .
2015-10-19 13:55:48 +01:00
Bryan Boreham
2f4d460c04
Merge pull request #1517 from weaveworks/1385-non-container-dns-add
...
LGTM. Fixes #1385
2015-10-19 12:52:09 +01:00
Bryan Boreham
50cc15af3b
Merge pull request #1477 from weaveworks/weave-1374
...
LGTM. Fixes #1374
2015-10-16 18:02:16 +01:00
Paul Bellamy
a0f0367e60
[proxy] don't kill containers when starting the proxy
2015-10-16 15:33:43 +01:00
Alvaro Saurin
5d2892f6fc
Test we respect --add-host when rewriting /etc/hosts
...
Simplify some tests
2015-10-16 11:47:07 +02:00
Matthias Radestock
61d289f414
Merge branch '1.1'
2015-10-15 18:14:20 +01:00
Matthias Radestock
44255862a9
prevent spurious errors from showing up
...
silly mistake
2015-10-15 18:12:56 +01:00
Matthias Radestock
ed9577150b
suppress spurious errors
2015-10-15 18:01:06 +01:00
Matthias Radestock
80319e7087
Merge branch '1.1'
2015-10-15 17:41:49 +01:00
Matthias Radestock
379048d8fc
make test/setup.sh work under go 1.5
...
Fixes #1543 .
2015-10-15 17:40:51 +01:00
Adam Harrison
813edcfe0a
Merge branch '1.1'
2015-10-15 14:59:29 +01:00
Adam Harrison
dea1405d71
Remove hardcoded docker bridge IP from proxy test
2015-10-15 14:39:56 +01:00
Bryan Boreham