Michael Bridgen
4ede33468e
Update docs and smoke-tests with new option names
2015-07-07 11:26:09 +01:00
Bryan Boreham
bd24307c2b
Merge pull request #1069 from 2opremio/fons/fix-tests-OSX
...
LGTM
2015-07-06 16:43:26 +01:00
Michael Bridgen
e0c7054f9b
Merge pull request #1075 from weaveworks/fons/test-vagrant-creation
...
Explain how to create the test VMs from vagrant
2015-07-06 16:31:22 +01:00
Alfonso Acosta
373d663b5e
Fix integration tests for OSX
2015-07-06 14:48:53 +01:00
Alfonso Acosta
e86d255a47
Add comment about running integration tests from the Vagrant build VM
2015-07-06 14:07:16 +01:00
Paul Bellamy
5c44f74475
rename proxy-(env|config) to (env|config)
...
Keep error message to stderr, as the proxy should be launched with
'weave launch'. 'proxy-(env|config)' are kept with a deprecation
warning, for a while.
2015-07-06 13:41:23 +01:00
Alfonso Acosta
cab4a7e1ee
Explain how to create the test VMs from vagrant
2015-07-05 18:59:53 +01:00
Bryan Boreham
ff2d7451e2
Remove -debug option, superceded by --log-level
2015-07-04 03:27:07 +01:00
Matthias Radestock
910b57731d
remove stray -debug in tests
2015-07-04 03:19:27 +01:00
Matthias Radestock
b8aa1d473b
remove dead code
2015-07-04 02:53:36 +01:00
Matthias Radestock
e25d1b8365
Merge branch '1.0'
2015-07-02 16:35:40 +01:00
Adam Harrison
d427c99161
Add smoke test
2015-07-02 14:29:38 +01:00
Matthias Radestock
2fee0f0184
Merge branch '1.0'
2015-07-01 14:02:57 +01:00
Bryan Boreham
a938608cc8
Call weave reset before deleting containers, to improve clean-down
2015-07-01 13:19:43 +01:00
Michael Bridgen
c0b2fe3e3b
Remove references to 'IPAM' in docs and UI
...
The option `--no-default-ipam` is replaced with
`--no-default-ipalloc`; the former will still work (in a 'last one
wins' way), but its usage message says it's deprecated.
2015-06-29 19:20:26 +01:00
Paul Bellamy
26cb65c357
making test helpers more robust so scope can use them
2015-06-29 10:22:10 +01:00
Paul Bellamy
1ef3bd3a8b
add docker version and weave version to test sanity checks
2015-06-29 10:20:55 +01:00
Matthias Radestock
51ecf05091
cosmetic: fix typo in comment
2015-06-27 09:35:14 +01:00
Matthias Radestock
55fbffef75
Merge pull request #1009 from awh/weave_launch_all_the_things
...
Weave launch all the things
Closes #962 .
2015-06-26 13:21:44 +01:00
Adam Harrison
d4c1766532
Fix smoke tests
2015-06-26 11:10:08 +01:00
Tom Wilkie
7780ac1078
Fix gce.sh destory timeouts.
2015-06-24 17:13:37 +00:00
Matthias Radestock
ae1805de76
separate the image build and export phases
...
That way the export can be just a single tar, which is more
convenient. And without introducing unnecessary image builds.
2015-06-24 02:54:45 +01:00
Matthias Radestock
eb9e450cf1
cosmetic
2015-06-23 19:10:10 +01:00
Paul Bellamy
95d72a57e8
Merge pull request #989 from rade/prefetch_test_images
...
prefetch test images
2015-06-23 15:14:59 +01:00
Adam Harrison
d6dca80dd7
Merge branch 'latest_release_doc_updates' into 1.0
...
Pull in GCE fix
2015-06-23 14:49:36 +01:00
Tom Wilkie
74c391f19c
Update gce.sh make_template command, and build a fresh template.
2015-06-23 14:48:48 +01:00
Matthias Radestock
ae8172ec97
simplify docker image removal
2015-06-23 14:39:29 +01:00
Matthias Radestock
369bd0f4dc
prefetch test images
...
This gives more consistent test execution times, and also make image
fetch failures more apparent and decoupled from the tests.
We could *always* just run pull, but it's an expensive operation, so
we check for the presence of the image first. The downside is that we
could be running old images. That is not a problem on our CI
infrastructure though since it spins up fresh VMs per for every tun.
2015-06-23 14:16:52 +01:00
Tom Wilkie
3b4a47a961
Update gce.sh make_template command, and build a fresh template.
2015-06-23 13:07:09 +00:00
Matthias Radestock
2c4cebe9d9
Merge branch '1.0'
2015-06-23 10:31:40 +01:00
Matthias Radestock
1a17b41bc3
reduce test output noise
2015-06-23 09:42:46 +01:00
Matthias Radestock
2e5e0a7730
remove pointless assertion
2015-06-23 09:42:46 +01:00
Matthias Radestock
b2f62cc635
show test failure output
...
step towards fixing #970
2015-06-23 09:42:46 +01:00
Paul Bellamy
acd5b91eb8
Merge remote-tracking branch 'upstream/1.0'
2015-06-22 17:28:50 +01:00
Paul Bellamy
34aa2e32d8
[proxy] Only prepend weavewait if not already present
...
This way `docker commit` will not stack up weavewaits.
2015-06-22 15:24:49 +01:00
Matthias Radestock
ebf725d869
add some tests
2015-06-22 11:26:33 +01:00
Matthias Radestock
0c87dcd656
cosmetic
2015-06-22 11:00:12 +01:00
Matthias Radestock
e51ecd73b3
refactor: extract helper
2015-06-18 19:01:10 +01:00
Matthias Radestock
5479d0a54d
improve test performance - only fetch status once per check
2015-06-18 18:53:06 +01:00
Matthias Radestock
6830b27317
cosmetic: correct some comments, tweak some arg parsing
2015-06-18 18:13:27 +01:00
Matthias Radestock
4399be7ad2
correct comments
2015-06-18 17:55:42 +01:00
Matthias Radestock
42d2a860eb
test more things, more obviously
2015-06-18 17:48:21 +01:00
Matthias Radestock
3ec0200067
cosmetic oops
2015-06-18 16:57:54 +01:00
Matthias Radestock
d1e4a8ec8a
cosmetic: vertical alignment and consistency for better readability
2015-06-18 16:26:16 +01:00
Matthias Radestock
501108e3ae
cosmetic: vertical alignment
2015-06-17 15:13:07 +01:00
Paul Bellamy
ca681bce13
[proxy] Add support for WEAVE_CIDR=none
...
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
2015-06-17 14:51:12 +01:00
Paul Bellamy
220c80c3ed
[proxy] --with-ipam -> --no-default-ipam
2015-06-17 11:31:33 +01:00
Matthias Radestock
809b048abd
fix sporadic 650_*.sh test failure caused by undefined variable
...
This is quite hilarious...
$BASE_IMAGE is not defined in config.sh. So running this test would
actually attempt to run something like
docker -H=... run -e WEAVE_CIDR=10.2.1.4/24 grep ^1$ /sys/class/net/ethwe/carrier
i.e. it would try to run the 'grep' image.
So why does this not fail all the time?
1) 610_*.sh defines $BASE_IMAGE.
2) 620_*.sh builds a 'grep' image.
If either of these tests are included in the same test run before
650_*.sh, then the latter will succeed.
Throw in our fabulous CircleCI scheduler, which distributes tests
according to their execution time, and you end up with sporadic
failures.
Fixes #938 .
2015-06-16 21:13:35 +01:00
Adam Harrison
b8afefa55f
Merge pull request #931 from paulbellamy/weavedns_default_search_domain
...
[dns] resolve names in `weave.local` by default unless hostname or search path is specified
2015-06-16 18:13:17 +01:00
Paul Bellamy
2c3baa9119
use weavedns search-domain by default
...
iff no hostname/dns-search specified
2015-06-16 15:13:19 +01:00
Michael Bridgen