From 8e9f8e264fd8fa970ef846daeb8d82f5d6d35c07 Mon Sep 17 00:00:00 2001 From: Katharine Berry Date: Tue, 8 Jan 2019 09:24:43 -0800 Subject: [PATCH] Never skip multi-node conformance tests (instead just fail). --- test/e2e/apps/daemon_set.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/e2e/apps/daemon_set.go b/test/e2e/apps/daemon_set.go index ee4176adc1..174d236cfb 100644 --- a/test/e2e/apps/daemon_set.go +++ b/test/e2e/apps/daemon_set.go @@ -374,8 +374,9 @@ var _ = SIGDescribe("Daemon set [Serial]", func() { rollback of updates to a DaemonSet. */ framework.ConformanceIt("should rollback without unnecessary restarts", func() { - // Skip clusters with only one node, where we cannot have half-done DaemonSet rollout for this test - framework.SkipUnlessNodeCountIsAtLeast(2) + 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}