From ab165fc6e54077a9071c7b9090dae751ec1e31c7 Mon Sep 17 00:00:00 2001 From: Bin Lu Date: Wed, 20 Feb 2019 17:45:15 +0800 Subject: [PATCH] Fix conformance daemon_set test failing in local cluster Fixing up conformance test related to: 1, ci-k8s-conformance-arm64-aws-cluster https://storage.googleapis.com/k8s-conformance-arm/logs/ci-k8s-conformance-arm64-aws-cluster/84/build-log.txt 2, conformance test results for ppc64le https://storage.googleapis.com/ppc64le-kubernetes/logs/ci-conformance-kubernetes/2809/build-log.txt Signed-off-by: Bin Lu --- test/e2e/apps/daemon_set.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/e2e/apps/daemon_set.go b/test/e2e/apps/daemon_set.go index 0bf968061f..6acfc57d84 100644 --- a/test/e2e/apps/daemon_set.go +++ b/test/e2e/apps/daemon_set.go @@ -377,7 +377,6 @@ var _ = SIGDescribe("Daemon set [Serial]", func() { if framework.TestContext.CloudConfig.NumNodes < 2 { framework.Logf("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) @@ -415,7 +414,11 @@ var _ = SIGDescribe("Daemon set [Serial]", func() { framework.Failf("unexpected pod found, image = %s", image) } } - Expect(len(existingPods)).NotTo(Equal(0)) + if framework.TestContext.CloudConfig.NumNodes < 2 { + Expect(len(existingPods)).To(Equal(0)) + } else { + Expect(len(existingPods)).NotTo(Equal(0)) + } Expect(len(newPods)).NotTo(Equal(0)) framework.Logf("Roll back the DaemonSet before rollout is complete")