Skip to content

K
k3s
Unverified Commit dfe2e0e7 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #75349 from brahmaroutu/cifailure_daemonset

Daemon Set Conformance test fails in CI process using ci-kubernetes-c…
parents 83d467c2 b64066b4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
test/e2e/apps/daemon_set.go
View file @ dfe2e0e7
...@@ -381,9 +381,8 @@ var _ = SIGDescribe("Daemon set [Serial]", func() { ...@@ -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() { ...@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment