Commit Graph

514 Commits

Author SHA1 Message Date
Dongluo Chen
b2de64872b Merge pull request #2205 from dongluochen/containerslots
Containerslots
2016-05-03 15:11:39 -07:00
Dong Chen
c4007e9507 Carry over pr/2137 with minor updates.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-05-03 14:29:38 -07:00
michael.freund
0ccc958b50 Filter for containerslots-label
Signed-off-by: michael.freund <michael.freund@shopgate.com>
2016-05-03 09:54:51 -07:00
Sun Hongliang
50be8f4802 use --cpu-shares instead of -c in integration test
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-04 00:12:58 +08:00
Nishant Totla
8cbb1b27a4 Merge pull request #2191 from dongluochen/testhang
Update stats test to stop connection
2016-05-02 13:32:04 -07:00
Dong Chen
116748e7bc Fix api/ps tests.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-05-02 12:26:56 -07:00
Nishant Totla
b69728a2c5 Merge pull request #2196 from allencloud/fix-typos
fix typos in test and other files
2016-05-01 16:54:33 -07:00
Sun Hongliang
6cd8a06c8f fix typos in test and other files
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-02 07:29:33 +08:00
Dong Chen
92834d1fa1 Update stats test to stop connection
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-04-29 17:58:52 -07:00
Dongluo Chen
04b70bff15 Merge pull request #2154 from xianlubird/master
Fix the bug that start container mess the host config
2016-04-29 17:02:08 -07:00
xianlubird
a3986cac05 Fix the bug that start container mess the host config
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-04-28 10:32:41 +08:00
Xian Chaobo
f39ac0e2c2 add support ps --filter volume
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-04-27 15:10:54 +08:00
Victor Vieux
ef7e2777a8 fix swarm build in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-26 11:16:37 -07:00
Victor Vieux
c882e5e5a7 rollback to Go 1.5.4
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-23 01:50:10 -07:00
Nishant Totla
4d56ba5190 Moving last few image operations to engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-22 13:47:51 -07:00
Victor Vieux
7882873d0a switch to go 1.6.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-21 17:11:32 -07:00
Alexandre Beslic
cf9806004f Merge pull request #2126 from vieux/update_compose
update compose, remove useless bash and improve tests
2016-04-21 16:51:37 -07:00
Otto Jongerius
5d66dd33a8 Teardown function needs to be declared before tests.
Signed-off-by: Otto Jongerius <ojongerius@atlassian.com>
2016-04-15 15:50:02 +12:00
Dongluo Chen
84a28a7de4 Merge pull request #2116 from MHBauer/volume-rm-race
volume rm integration test needs wait to avoid race
2016-04-14 17:47:30 -07:00
Victor Vieux
ddd4aa2bf2 update compose, remove useless bash and improve test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 14:20:01 -07:00
Victor Vieux
d006ef95f0 move dependencies to vendor/
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 13:25:16 -07:00
Nishant Totla
09deb06382 Merge pull request #2123 from vieux/migrate_go_16
bump to 1.6.1
2016-04-14 12:03:33 -07:00
Victor Vieux
d365b25558 bump to 1.6.1
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 11:41:05 -07:00
Nishant Totla
e29ff44caf Fixing integration tests
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:01 -07:00
Morgan Bauer
d2e375e31d volume rm integration test needs wait to avoid race
- additional comments in test

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-04-13 11:47:00 +01:00
Victor Vieux
03f7a1167d update to 1.5.4
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-12 20:08:36 -07:00
Victor Vieux
aaa10d16b7 fix restart docker in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-07 14:14:25 -07:00
Alexandre Beslic
ac6341066d Fix Consul Leader Election Failure on multi-server
This fixes an error with Consul which fails to see a new
swarm leader after a consul leader soft restart because
of session renewal and missing status update.

Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-04-07 12:23:47 -07:00
Sun Hongliang
d403254ed2 1.validate cluster option swarm.overcommit
2.change swarm.createretry's error info and add its integration test
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-07 09:00:41 +08:00
Victor Vieux
92b3e03220 increate timeout in 'leader election - rescheduling' test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-25 15:50:28 -07:00
Sun Hongliang
e60b93aef3 make port 0 invalid in checkAddrFormat
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-30 19:47:42 +08:00
Victor Vieux
b963ffca3e improve volume inspect test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 13:41:38 -07:00
Victor Vieux
ffba4054dc enable rescheduling watchdog only when primary
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 06:34:05 -07:00
Dong Chen
96980d954d Skip unstable tests from Docker bug 14203.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-23 18:30:21 -07:00
Morgan Bauer
2de0f86b5f Merge pull request #1998 from dongluochen/HostnameUpdate
Docker changes hostname/domain in container config
2016-03-18 19:53:41 -07:00
Dong Chen
ee5e94fd63 Update mesos test.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-18 17:14:00 -07:00
Dong Chen
951c2d1cca Docker engine updates hostname/domainname.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-18 16:18:01 -07:00
Sun Hongliang
01fc95fe31 classify whether constraint error or affinity error
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-18 21:51:31 +08:00
Xian Chaobo
a91f1818c4 Merge pull request #1963 from allencloud/validate-duration-flag-positive
validate duration flags: --delay, --timeout,--replication-ttl
2016-03-18 08:55:24 +08:00
Dongluo Chen
85f6d57f21 Merge pull request #1972 from vieux/pass-host-config
HostConfig for /start endpoint
2016-03-16 17:19:29 -07:00
Victor Vieux
c05c7905e9 Merge pull request #1882 from dongluochen/SkipTestsWithDocker1.9Issue
Docker issue #14203 affects nodemanagement tests in Docker 1.9.
2016-03-16 15:50:43 -07:00
Victor Vieux
56affa1ada fix image matching via id
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-16 15:12:56 -07:00
Sun Hongliang
5aa339ed38 validate duration flags:--delay, --timeout,--replication-ttl
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-16 10:09:57 +08:00
Xian Chaobo
66b78ef043 Merge pull request #1962 from allencloud/validate-refresh-time-interval-posotive
force to validate min and max refresh interval to be positive
2016-03-15 17:33:13 +08:00
Victor Vieux
b05dee4d6e HostConfig for /start endpoint
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 19:23:57 -07:00
Nishant Totla
5075e95612 Printing entire set of unsatisfiable constraints for container scheduling
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-14 17:17:06 -07:00
Sun Hongliang
b9d0d8927f force to validate min and max refresh interval to be positive
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-15 00:29:08 +08:00
Xian Chaobo
e7065eabf7 add support ps node filter
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-11 10:31:33 +08:00
Alexandre Beslic
a348207f18 Merge pull request #1835 from jimmyxian/add-support-some-run-option
Add support some run options
2016-03-03 10:12:17 -08:00
Xian Chaobo
ba4ad74de3 add support some run options
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-03 19:53:47 +08:00