From c9de39ca9498deb09053c5f87044593bd6ec319c Mon Sep 17 00:00:00 2001 From: Olli Janatuinen Date: Sun, 23 Dec 2018 13:39:58 +0200 Subject: [PATCH] Disabled these tests on s390x and ppc64le: - TestAPISwarmLeaderElection - TestAPISwarmRaftQuorum - TestSwarmClusterRotateUnlockKey because they are known to be flaky. Signed-off-by: Olli Janatuinen (cherry picked from commit 02157c638ba0c325d8fd1debc1678e7e99eacfc1) Signed-off-by: Kir Kolyshkin Upstream-commit: 278f1a130b66de23f07e472792b70b640f777666 Component: engine --- .../integration-cli/docker_api_swarm_test.go | 15 +++++++++++++++ .../integration-cli/docker_cli_swarm_test.go | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/components/engine/integration-cli/docker_api_swarm_test.go b/components/engine/integration-cli/docker_api_swarm_test.go index 10b9938486..ddbcd56556 100644 --- a/components/engine/integration-cli/docker_api_swarm_test.go +++ b/components/engine/integration-cli/docker_api_swarm_test.go @@ -9,6 +9,7 @@ import ( "net" "net/http" "path/filepath" + "runtime" "strings" "sync" "time" @@ -294,6 +295,13 @@ func (s *DockerSwarmSuite) TestAPISwarmLeaderProxy(c *check.C) { } func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(c *check.C) { + if runtime.GOARCH == "s390x" { + c.Skip("Disabled on s390x") + } + if runtime.GOARCH == "ppc64le" { + c.Skip("Disabled on ppc64le") + } + // Create 3 nodes d1 := s.AddDaemon(c, true, true) d2 := s.AddDaemon(c, true, true) @@ -357,6 +365,13 @@ func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(c *check.C) { } func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *check.C) { + if runtime.GOARCH == "s390x" { + c.Skip("Disabled on s390x") + } + if runtime.GOARCH == "ppc64le" { + c.Skip("Disabled on ppc64le") + } + d1 := s.AddDaemon(c, true, true) d2 := s.AddDaemon(c, true, true) d3 := s.AddDaemon(c, true, true) diff --git a/components/engine/integration-cli/docker_cli_swarm_test.go b/components/engine/integration-cli/docker_cli_swarm_test.go index f6fadcf995..3433e3b39a 100644 --- a/components/engine/integration-cli/docker_cli_swarm_test.go +++ b/components/engine/integration-cli/docker_cli_swarm_test.go @@ -13,6 +13,7 @@ import ( "net/http/httptest" "os" "path/filepath" + "runtime" "strings" "time" @@ -1374,6 +1375,13 @@ func (s *DockerSwarmSuite) TestSwarmRotateUnlockKey(c *check.C) { // This one keeps the leader up, and asserts that other manager nodes in the cluster also have their unlock // key rotated. func (s *DockerSwarmSuite) TestSwarmClusterRotateUnlockKey(c *check.C) { + if runtime.GOARCH == "s390x" { + c.Skip("Disabled on s390x") + } + if runtime.GOARCH == "ppc64le" { + c.Skip("Disabled on ppc64le") + } + d1 := s.AddDaemon(c, true, true) // leader - don't restart this one, we don't want leader election delays d2 := s.AddDaemon(c, true, true) d3 := s.AddDaemon(c, true, true)