f6254241df
using docker_host instead of docker
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-05 21:09:25 -04:00
2e874d3148
fix issue: #701
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-05 21:08:01 -04:00
34afafa3bf
Merge pull request #723 from vieux/reenable_deps
...
do not use inspect -f in tests
2015-05-05 17:46:06 -07:00
83ed309da6
do not use -f in tests
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-05 16:08:38 -07:00
92abcac33c
Merge pull request #706 from jimmyxian/bug-fix-exec
...
bug fix: check status code in exec
2015-05-05 14:32:39 -07:00
2a3a32274b
Merge pull request #716 from aluzzardi/integration-cli
...
integration: Run tests with Docker master
2015-05-05 14:09:40 -07:00
a313f46bb8
add test when container is not running
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-05 04:55:17 -04:00
28043dfd7d
check status code in exec
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-05 04:45:29 -04:00
1187069407
integration: fix nodes patterns in docker_swarm info
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-05 00:20:22 -07:00
b7413d3138
integration helpers: fix the wait for docker join
...
It used to output `[: -eq: unary operator expected` since the grep
command didn't give any output, therefore generating a syntax error.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:52:34 -07:00
389da48e5e
integration: skip dependency tests
...
They rely on docker inspect --format and it's currently broken on docker
master.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:22:46 -07:00
2605eff5fc
discovery integration: fix for docker master
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:20:42 -07:00
88033393ba
api integration: Fixes for docker master.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
5d10f47b32
integration helpers: move the docker_ functions together
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
b4af7acd83
integration: Run tests using docker master.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
3bb37e671a
integration runner: Use the same CLI as the one available in the image.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
2ba8acbaca
integration: Ensure the client and server are running the same version.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
86bf53a504
integration: Support using a different CLI.
...
- `docker` will now use the CLI defined in $DOCKER_BINARY
- In order to communicate with the host docker, one must use
`docker_host`
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
fdf74cef2a
Merge pull request #465 from chanwit/test-create-cluster-on-hub
...
integration: add a test to verify creating cluster on hub
2015-05-04 22:00:37 -07:00
6ecf51f458
add integration test for token discovery
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-05-05 11:44:47 +07:00
89fe217e12
use retry to wait for swarm join
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-05-05 11:44:47 +07:00
cecfa12a59
Merge pull request #713 from aluzzardi/integration-skip-broken
...
integration: Fix tests running in Jenkins
2015-05-04 20:45:14 -07:00
4b3bc9b35b
integration: Fix tests in jenkins.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 20:35:56 -07:00
30f88f9777
Merge pull request #710 from vieux/remove_unused_fields
...
remove unused fields from node
2015-05-04 19:00:28 -07:00
3338a12295
Merge pull request #712 from aluzzardi/integration-aufs
...
integration: Use aufs by default.
2015-05-04 17:39:01 -07:00
ebcf4f7272
Merge pull request #711 from aluzzardi/integration-fix-dockerfile
...
integration: Added missing dependency to Dockerfile.
2015-05-04 17:33:51 -07:00
6df673372f
integration: Use aufs by default.
...
The problem has been fixed in the dind images.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 17:29:00 -07:00
a2862280f1
integration: Added missing dependency to Dockerfile.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 17:25:02 -07:00
9dfd82e5ff
remove unused fields from node
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-04 16:56:55 -07:00
ae77390be2
Merge pull request #709 from aluzzardi/integration-fix-attach
...
fix attach integration test
2015-05-04 15:41:12 -07:00
af09d0c432
Merge pull request #704 from jimmyxian/bug-fix-tag
...
bug fix: add return when not found image
2015-05-04 15:29:39 -07:00
97aad7e60c
fix attach integration test
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 15:18:03 -07:00
851e978dcd
Merge pull request #696 from aluzzardi/integration-in-docker
...
integration tests: Support for running within Docker.
2015-05-04 14:54:08 -07:00
d41e7c89b2
Merge pull request #708 from aluzzardi/integration-dont-build
...
integration tests: Don't build binaries anymore, it's too slow.
2015-05-04 14:52:01 -07:00
c236e2f11d
integration runner: run tests on a fresh binary.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:46:00 -07:00
2600c8823b
integration tests: Support for running within Docker.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:46:00 -07:00
4ac0a43753
travis: Lint all shell files.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:46:00 -07:00
f50af455fa
integration tests: Don't build binaries anymore, it's too slow.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:20:28 -07:00
aa98a1d5c3
Merge pull request #702 from aluzzardi/integration-fix-exec
...
DO NOT MERGE - Integration fix exec
2015-05-04 13:44:35 -07:00
3cc8a2b5fd
Merge pull request #703 from aluzzardi/integration-image
...
integration: Use the brand new dind image.
2015-05-04 13:43:38 -07:00
b27e9896bc
Merge pull request #700 from aluzzardi/integration-drivers
...
integration tests: run with native/vfs by default.
2015-05-04 13:43:16 -07:00
ad98b865b7
integration: Run engines with --net=host.
...
Since we were mapping the port back to the host anyway, this doesn't
change anything.
However, it does fix `docker exec`.
Fixes #658
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 13:36:36 -07:00
f802da02d7
bug fix return when not found image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-04 04:48:44 -04:00
24aaaa029e
integration: Use the brand new dind image.
...
We now have dockerswarm/dind:
- Much more lightweight.
- Exists in every version since Docker 1.0.0.
Depends on #700 as it cannot run on aufs.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-03 19:20:47 -07:00
671ddc8feb
integration tests: run with native/vfs by default.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-03 19:08:02 -07:00
92f8c8ec60
Merge pull request #693 from aluzzardi/integration-retry
...
integration: Add the re-usable "retry" helper.
2015-05-02 16:17:38 -07:00
a6ad9a073a
Merge pull request #690 from aluzzardi/lint-tests
...
travis: Lint test files (ensure they are not space indented)
2015-04-30 22:32:48 -07:00
f9a03c62f1
integration: Add the re-usable "retry" helper.
...
Retry was kind of extracted from wait_until_reachable. The goal is to be
able to wait for a command to succeed, or fail if it doesn't succeed
after a defined number of attempts.
Indirectly improve the error logging: the output of the retry command
won't show up unless it constantly failed.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 20:09:54 -07:00
85b4163f69
travis: Lint test files (ensure they are not space indented)
...
Fixed tab/spaces for existing integration tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 17:31:14 -07:00
b39e023e03
Merge pull request #673 from vieux/labels_storage
...
store constraints and affinities as labels
2015-04-30 14:36:23 -07:00
Xian Chaobo