Commit Graph

381 Commits

Author SHA1 Message Date
Victor Vieux
cdd42a5c6b display all the containers that are part of a global network on inspect
update godeps

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-12-15 17:48:35 -08:00
Isabel Jimenez
70a2713c60 Adding integration tests for mesos
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-12-11 16:14:49 -05:00
Victor Vieux
4b33656bb4 return proper error for inspect and proxy on unhealthy node
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-12-10 20:05:17 -08:00
Alexandre Beslic
31791e2241 Merge pull request #1513 from vieux/compose_1.5.2
update compose to 1.5.2
2015-12-08 12:43:37 -08:00
Victor Vieux
4aafe4aa7b Merge pull request #1492 from aluzzardi/profiling
Enable profiling over HTTP in debug mode
2015-12-08 12:43:00 -08:00
Victor Vieux
b399d7c7ed update compose to 1.5.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 22:05:58 -08:00
Victor Vieux
0bddb0096f longer retries
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 22:04:14 -08:00
Victor Vieux
9677ddd06f 1.5.1->1.5.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 21:45:34 -08:00
Victor Vieux
a4a1d3bd01 Merge pull request #1466 from abronan/fix_ci_discovery_race
Integration: Wait for nodes to be registered and discovered before testing
2015-12-07 21:11:20 -08:00
Victor Vieux
f1b7b7be59 fix tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 19:57:29 -08:00
Victor Vieux
67a4d559db Merge pull request #1449 from jimenez/mesos_user_abnormal_error
Improving error output for bad swarm mesos user
2015-12-07 13:43:34 -08:00
Xian Chaobo
19c0c0e6f9 integration: fix retry time when check disconnect events
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-12-03 16:53:24 +08:00
Alexandre Beslic
44d96a6185 integration: fix --kernel-memory value set too low
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-12-03 00:28:00 -08:00
Victor Vieux
a17f182026 add mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-02 22:16:00 -08:00
Alexandre Beslic
2ac860e335 integration: wait for agents to be registered on the Manager before running tests
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-12-02 22:09:17 -08:00
Victor Vieux
f73ec80548 default back to aufs
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-02 20:45:15 -08:00
Xian Chaobo
63498b1a80 set MemorySwappiness default value
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-12-04 09:25:32 +08:00
Isabel Jimenez
a250ded715 Adding zk tests for swarm-mesos integration
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-12-02 02:40:09 -05:00
Victor Vieux
d295d4b323 update compose to 1.5.1
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-01 02:27:50 -08:00
Xian Chaobo
b85c2a65c6 fix CI
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-11-26 10:49:08 +08:00
Victor Vieux
24fc1b6909 Merge pull request #1451 from aluzzardi/parallel-affinity-fix
Set labels for pending containers
2015-11-25 15:19:58 -08:00
Alexandre Beslic
e82752cace Merge pull request #1363 from dongluochen/refreshConfiguration
add engine options for refresh interval
2015-11-25 14:30:16 -08:00
Andrea Luzzardi
905a8c8e5a Add parallel label affinity integration tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-11-25 06:58:06 -08:00
Andrea Luzzardi
0961c1e48a Add parallel to integration test environment.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-11-25 06:57:51 -08:00
Isabel Jimenez
e71bda76f8 Improving error output for bad swarm mesos user
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-11-25 04:24:08 -05:00
Alexandre Beslic
c4f85c531a upgrade integration environment
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-11-22 15:31:57 -08:00
Alexandre Beslic
bb26c7c164 replace deprecated --daemon flag by daemon when starting docker in test runner
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-11-22 14:58:44 -08:00
Alexandre Beslic
f2944386df Update Docker version in swarm-test-env Dockerfile
Update the version of docker to 1.9.0 because of helpers
removal in hack/dind script that was mounting the cgroups.

It's now done automatically inside the containers as of
1.8.0.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-11-20 16:53:54 -08:00
Dong Chen
a150a0d521 Add cli test for engine refresh options
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-11-18 13:45:39 -08:00
Xian Chaobo
bea12ab8ab add support do with image digest
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-11-11 12:11:08 +08:00
Alexandre Beslic
374370e39d fix integration tests, --exec-driver has been removed in docker master
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-11-09 09:34:37 -08:00
Victor Vieux
f3bffb2dd9 update compose to 1.5.0
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-03 16:45:09 -08:00
Victor Vieux
c286a183b3 fix diff test
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-02 18:03:29 -08:00
Victor Vieux
3c397e5b96 update test name
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-02 16:32:43 -08:00
Xian Chaobo
5aae69fc58 add integraion test for rmi -f with image tag
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-31 10:36:02 +08:00
Victor Vieux
1c1a99038e ensure docker network inspect is the same as the engine one
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-30 00:38:42 -07:00
Victor Vieux
d2c5446ea0 Merge pull request #1340 from jimmyxian/volume-driver
Move VolumeDriver to HostConfig
2015-10-28 15:28:53 -07:00
Alexandre Beslic
e8dd274b65 Merge pull request #1342 from vieux/update_to_1.5.1
switch to go1.5.1
2015-10-28 11:47:11 -07:00
Victor Vieux
86816e7d44 Merge pull request #1287 from dnephin/fix_filter_images_by_repo
Fix filter images by repo
2015-10-27 21:33:25 -07:00
Victor Vieux
6e9362af50 add file back to test env
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-27 21:13:12 -07:00
Xian Chaobo
588c29c3cc move VolumeDriver to HostConfig
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-28 10:58:24 +08:00
Daniel Nephin
e001980b5c Add filter by image name support to /images/json
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-27 11:00:37 -04:00
Victor Vieux
b924f7f8fa switch to go1.5.1
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-26 11:49:48 -07:00
Victor Costan
e32b3211ae Swarm filters support in image building.
When building an image (POST /build), swarm will extract filters from
buildargs. This is similar to how container creation (POST
/containers/create) extracts filters from environment variables.

Signed-off-by: Victor Costan <costan@gmail.com>
2015-10-23 14:24:42 -04:00
Xian Chaobo
c947d5be69 add support some run options
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-22 09:14:23 +08:00
Alexandre Beslic
50671ab6f3 Integration test for regression with parallel docker run when specifying a port
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-21 02:59:04 -07:00
Victor Vieux
2c2aa91f9f fix test Dockerfile, use precompiled go
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-19 09:55:27 -07:00
Victor Vieux
07a102adc8 fix tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:46:38 -07:00
Alexandre Beslic
755e68b5cf Fix timing issue on zookeeper failure test
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-15 08:52:00 -07:00
Victor Vieux
bef2892cee Merge pull request #1271 from jimmyxian/fix-reschedule-with-soft-affinity
Do not try retry with soft-image-affinity when have node constraint
2015-10-15 13:52:29 -07:00