mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #38423 from olljanat/disable-integration-tests-on-z-and-powerpc
Disabled Flaky tests on powerpc and z
This commit is contained in:
commit
74ad4f2d2c
2 changed files with 23 additions and 0 deletions
|
@ -9,6 +9,7 @@ import (
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
@ -294,6 +295,13 @@ func (s *DockerSwarmSuite) TestAPISwarmLeaderProxy(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(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
|
// Create 3 nodes
|
||||||
d1 := s.AddDaemon(c, true, true)
|
d1 := s.AddDaemon(c, true, true)
|
||||||
d2 := 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) {
|
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)
|
d1 := s.AddDaemon(c, true, true)
|
||||||
d2 := s.AddDaemon(c, true, true)
|
d2 := s.AddDaemon(c, true, true)
|
||||||
d3 := s.AddDaemon(c, true, true)
|
d3 := s.AddDaemon(c, true, true)
|
||||||
|
|
|
@ -13,6 +13,7 @@ import (
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
@ -1314,6 +1315,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
|
// This one keeps the leader up, and asserts that other manager nodes in the cluster also have their unlock
|
||||||
// key rotated.
|
// key rotated.
|
||||||
func (s *DockerSwarmSuite) TestSwarmClusterRotateUnlockKey(c *check.C) {
|
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
|
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)
|
d2 := s.AddDaemon(c, true, true)
|
||||||
d3 := s.AddDaemon(c, true, true)
|
d3 := s.AddDaemon(c, true, true)
|
||||||
|
|
Loading…
Add table
Reference in a new issue