Alexandre Beslic
23f66f8cc6
Merge pull request #858 from aluzzardi/addr-flag
...
Replace --addr with --advertise
2015-05-27 11:44:41 -07:00
Victor Vieux
2b5835a7cc
Merge pull request #860 from abronan/add_test_removal
...
pkg/store: Additional check in Node Removal integration test
2015-05-27 10:55:28 -07:00
Alexandre Beslic
838aab1d34
Add node back to the cluster after Node Removal test (after regression on zookeeper)
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-26 18:33:10 -07:00
Andrea Luzzardi
7394be0704
Replace --addr with --advertise
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 17:43:14 -07:00
Victor Vieux
300932b2d5
add slave_test.go, add tast_test.go
...
add basic network mode support
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Timothy Chen <tnachen@gmail.com>
2015-05-26 16:22:34 -04:00
Victor Vieux
0b24992d7c
Merge pull request #815 from jimmyxian/rmi_by_name
...
Fix image match
2015-05-26 10:43:59 -07:00
Andrea Luzzardi
b4efc08dfc
api: Integrate leader election.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-22 21:23:34 -07:00
Andrea Luzzardi
a3950e7f65
Merge pull request #796 from jimmyxian/refresh-container
...
Add Refresh container
2015-05-21 18:30:47 -07:00
Alexandre Beslic
b8d72c291d
Cleanup, fix Integration tests and use of a single global Session in Consul
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 15:27:39 -07:00
Alexandre Beslic
ec478d8ed5
Add integration tests for engines departure with node removal and ephemeral behavior
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:08:56 -07:00
Alexandre Beslic
f81de46ab4
Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests)
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 10:25:31 -07:00
Alexandre Beslic
d5915b2a09
Merge pull request #811 from aluzzardi/node-removal
...
Handle Node Removal from Discovery correctly
2015-05-19 10:11:10 -07:00
Victor Vieux
7b3c889407
Merge pull request #809 from jimmyxian/bugfix-volumes-from
...
fix #807 : support --volumes-from rw/ro
2015-05-18 19:41:36 -07:00
Andrea Luzzardi
7dec704b8a
integration: node removal for file discovery
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi
6fbbfd7287
integration: give zk some extra time.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:45:11 -07:00
Andrea Luzzardi
ac18ef381d
integration: cover more grounds in discovery testing.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
9179ed3d34
integration: move discovery into its own folder
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
7430fe5141
fix hb/timeout being time.Duration in a few places
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi
2a27adaea1
discovery integration: No need to wait anymore
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Xian Chaobo
e555e8f021
merge volumes-from integration tests
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-16 08:22:17 +08:00
Xian Chaobo
b94d6baf2b
fix #807 : support --volumes-from rw/ro
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-16 03:01:41 +08:00
Xian Chaobo
ada8208157
remove retry in test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-15 05:12:22 -04:00
Xian Chaobo
b89d07a1cf
add rmi without tag integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-14 14:44:35 -07:00
Andrea Luzzardi
ece52698d6
Merge pull request #783 from vieux/fix_image_match
...
fix image.Match to take only repo or repo:tag
2015-05-13 19:05:30 -07:00
Victor Vieux
f9b457f152
fix image.Match
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 17:36:08 -07:00
Victor Vieux
59cd11b946
change swarm.heartbeat to swarm.discovery.heartbeat
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:48:07 -07:00
Victor Vieux
5db3a9cd0e
remove options struct, yay!
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:36:30 -07:00
Victor Vieux
a9eb48dcf2
Merge pull request #745 from aluzzardi/swarm-id
...
Support for Swarm IDs
2015-05-12 15:12:19 -07:00
Andrea Luzzardi
f5ad970c87
integration: more debug into affinity
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:54:36 -07:00
Andrea Luzzardi
b9cb4f4f35
integration: add debug to constraint
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:03:45 -07:00
Andrea Luzzardi
dde47ee650
swarm IDs: Convert Swarm ID to Container ID in API Proxy.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
b6a7c3d7f5
swarm ID: Remove backward compatibility.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
5c801d2c6a
swarm id: Handle compatibility.
...
Containers created with Swarm<0.3.0 or directly on the host without
going through Swarm don't have a Swarm ID. We are going to fake it by
using the Container ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
abfe5e6f4c
Add support for Swarm IDs.
...
- Every container that gets created through Swarm gets a Swarm ID
assigned (as a label).
- All API operations (start, stop, ...) can be performed by using either
the container ID or the swarm ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:07 -07:00
Andrea Luzzardi
d88105dbfe
integration: minor cleanup of docker save multi-images
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:44:15 -07:00
Xian Chaobo
42af0fadd7
fix var name and integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 16:44:15 -07:00
Xian Chaobo
3962f6ffdf
add-support-images-save
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 16:44:15 -07:00
Victor Vieux
5b3a03b852
Merge pull request #759 from aluzzardi/integration-race-fixes
...
integration: Fix API races related to delay in refresh.
2015-05-11 16:09:46 -07:00
Andrea Luzzardi
abc5e4ebf1
Merge pull request #758 from chanwit/wait-for-zk-started
...
integration: wait for zookeeper to start
2015-05-11 15:44:59 -07:00
Sriram Natarajan
e9f773f10f
Etcd Integration test
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-05-11 21:53:16 +00:00
Andrea Luzzardi
fdd3513cbf
integration: check status with ps filter rather than inspect.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-09 16:33:57 -07:00
Andrea Luzzardi
a0973e6f91
integration: Fix pause test and make sure the cleanup is done properly.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 19:52:49 -07:00
Andrea Luzzardi
4bb035e41a
integration: Fix API races related to delay in refresh.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 19:26:58 -07:00
Chanwit Kaewkasi
d0320d78a6
integration: wait for zookeeper to start
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-05-09 08:44:48 +07:00
Andrea Luzzardi
edb3504bc4
integration: affinities: add debug to help fix the test.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 18:23:52 -07:00
Andrea Luzzardi
c8f0fa545a
integration: events: Fix race condition in tests.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 18:22:55 -07:00
Sriram Natarajan
63492feb3f
Integration test for consul discovery service
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-05-08 21:11:31 +00:00
Xian Chaobo
b986c151c5
fix all api tests which do not need to use run
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-07 22:07:34 -04:00
Andrea Luzzardi
f50dedee66
Merge pull request #747 from vieux/fix_flacky_rm_test
...
fix flacky rm test
2015-05-07 17:30:58 -07:00
Victor Vieux
aeb83be5df
fix flacky rm test
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-07 16:21:43 -07:00