Skip to content
Permalink
Browse files

Merge pull request #82415 from tnozicka/backport-75349-to-1.14

Automated cherry pick of #75349: Daemon Set Conformance test fails in CI process using ci-kubernetes-c…
  • Loading branch information...
k8s-ci-robot committed Sep 11, 2019
2 parents de90ca7 + 8af00c4 commit 5bcd994dbfa7f3315eddcacbac82fbd7e6c87750
Showing with 4 additions and 4 deletions.
  1. +4 −4 test/e2e/apps/daemon_set.go
@@ -381,9 +381,8 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
rollback of updates to a DaemonSet.
*/
framework.ConformanceIt("should rollback without unnecessary restarts", func() {
if framework.TestContext.CloudConfig.NumNodes < 2 {
framework.Logf("Conformance test suite needs a cluster with at least 2 nodes.")
}
schedulableNodes := framework.GetReadySchedulableNodesOrDie(c)
Expect(len(schedulableNodes.Items)).To(BeNumerically(">", 1), "Conformance test suite needs a cluster with at least 2 nodes.")
framework.Logf("Create a RollingUpdate DaemonSet")
label := map[string]string{daemonsetNameLabel: dsName}
ds := newDaemonSet(dsName, image, label)
@@ -421,7 +420,8 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
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))
} else {
Expect(len(existingPods)).NotTo(Equal(0))

0 comments on commit 5bcd994

Please sign in to comment.
You can’t perform that action at this time.