Skip to content

Commit

Permalink
Wait for all Nodes to be schedulable before running e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
gmarek committed Nov 17, 2016
1 parent 4242869 commit 35626b2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
4 changes: 0 additions & 4 deletions test/e2e/density.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,6 @@ var _ = framework.KubeDescribe("Density", func() {
c = f.ClientSet
ns = f.Namespace.Name

// In large clusters we may get to this point but still have a bunch
// of nodes without Routes created. Since this would make a node
// unschedulable, we need to wait until all of them are schedulable.
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.NodeSchedulableTimeout))
masters, nodes = framework.GetMasterAndWorkerNodesOrDie(c)
nodeCount = len(nodes.Items)
Expect(nodeCount).NotTo(BeZero())
Expand Down
5 changes: 5 additions & 0 deletions test/e2e/e2e.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
}
}

// In large clusters we may get to this point but still have a bunch
// of nodes without Routes created. Since this would make a node
// unschedulable, we need to wait until all of them are schedulable.
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.NodeSchedulableTimeout))

// Ensure all pods are running and ready before starting tests (otherwise,
// cluster infrastructure pods that are being pulled or started can block
// test pods from running, and tests that ensure all pods are running and
Expand Down
5 changes: 0 additions & 5 deletions test/e2e/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@ var _ = framework.KubeDescribe("Load capacity", func() {
BeforeEach(func() {
clientset = f.ClientSet

// In large clusters we may get to this point but still have a bunch
// of nodes without Routes created. Since this would make a node
// unschedulable, we need to wait until all of them are schedulable.
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(clientset, framework.NodeSchedulableTimeout))

ns = f.Namespace.Name
nodes := framework.GetReadySchedulableNodesOrDie(clientset)
nodeCount = len(nodes.Items)
Expand Down

0 comments on commit 35626b2

Please sign in to comment.