github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37001 from gmarek/routes

Browse Source 
Automatic merge from submit-queue

Wait for all Nodes to be schedulable before running e2e tests

This should fix the problem we're seeing when running tests on large clusters.

cc @dchen1107
This commit is contained in:
Kubernetes Submit Queue 2016-11-17 09:03:30 -08:00 committed by GitHub
commit 5efdea63b2
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/density.go
View File

@ -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())

5
test/e2e/e2e.go
View File

@ -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

5
test/e2e/load.go
View File

@ -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)