github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 22:05:59 +00:00
Code Issues Projects Releases Wiki Activity

Daemon Set Conformance test fails in CI process using ci-kubernetes-conformance-image as the num nodes is calculates incorrectly by the test context.

Browse Source 
Fixes #75348
This commit is contained in:
Srini Brahmaroutu 2019-03-13 17:08:11 -07:00
parent 8142ab5904
commit b64066b41b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/apps/daemon_set.go
View File

@ -381,9 +381,8 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
rollback of updates to a DaemonSet. rollback of updates to a DaemonSet.
*/ */
framework.ConformanceIt("should rollback without unnecessary restarts", func() { framework.ConformanceIt("should rollback without unnecessary restarts", func() {
if framework.TestContext.CloudConfig.NumNodes < 2 { schedulableNodes := framework.GetReadySchedulableNodesOrDie(c)
framework.Logf("Conformance test suite needs a cluster with at least 2 nodes.") Expect(len(schedulableNodes.Items)).To(BeNumerically(">", 1), "Conformance test suite needs a cluster with at least 2 nodes.")
}
framework.Logf("Create a RollingUpdate DaemonSet") framework.Logf("Create a RollingUpdate DaemonSet")
label := map[string]string{daemonsetNameLabel: dsName} label := map[string]string{daemonsetNameLabel: dsName}
ds := newDaemonSet(dsName, image, label) ds := newDaemonSet(dsName, image, label)
@ -421,7 +420,8 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
framework.Failf("unexpected pod found, image = %s", image) framework.Failf("unexpected pod found, image = %s", image)
} }
} }
if framework.TestContext.CloudConfig.NumNodes < 2 { schedulableNodes = framework.GetReadySchedulableNodesOrDie(c)
if len(schedulableNodes.Items) < 2 {
Expect(len(existingPods)).To(Equal(0)) Expect(len(existingPods)).To(Equal(0))
} else { } else {
Expect(len(existingPods)).NotTo(Equal(0)) Expect(len(existingPods)).NotTo(Equal(0))