toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23551 from tonistiigi/update-swarmkit

Browse Source 
Update swarmkit to 25572005f
Upstream-commit: 574f7d2149930749256d075e2f60614ea97c85ae
Component: engine
This commit is contained in:
Arnaud Porterie
2016-06-15 02:25:31 +00:00
committed by GitHub
parent d191ef8662 db7d3c4eb4
commit 50a4204953
32 changed files with 1477 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/engine/integration-cli/docker_api_swarm_test.go
View File

@ -432,14 +432,13 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
n.Spec.Availability = swarm.NodeAvailabilityActive
})
// change environment variable, resulting balanced rescheduling
d1.updateService(c, d1.getService(c, id), func(s *swarm.Service) {
s.Spec.TaskTemplate.ContainerSpec.Env = []string{"FOO=BAR"}
s.Spec.UpdateConfig = &swarm.UpdateConfig{
Parallelism: 2,
Delay: 250 * time.Millisecond,
}
})
instances = 1
d1.updateService(c, d1.getService(c, id), setInstances(instances))
waitAndAssert(c, defaultReconciliationTimeout*2, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount), checker.Equals, instances)
instances = 8
d1.updateService(c, d1.getService(c, id), setInstances(instances))
// drained node first so we don't get any old containers
waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.GreaterThan, 0)
@ -453,8 +452,6 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
n.Spec.Availability = swarm.NodeAvailabilityPause
})
c.Skip("known flakiness with scaling up from this state")
instances = 14
d1.updateService(c, d1.getService(c, id), setInstances(instances))