Merge pull request #23526 from tonistiigi/skip-drain-test

Temporarily skip flaky part of the drain test

daemon/cluster/cluster.go

@@ -28,7 +28,7 @@ import (
 
 const swarmDirName = "swarm"
 const controlSocket = "control.sock"
-const swarmConnectTimeout = 5 * time.Second
+const swarmConnectTimeout = 10 * time.Second
 const stateFile = "docker-state.json"
 
 const (

integration-cli/docker_api_swarm_test.go

@@ -453,6 +453,8 @@ 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))