Merge pull request #72690 from Katharine/no-conformance-skips

Never skip multi-node conformance tests (instead just fail).
pull/564/head
Kubernetes Prow Robot 2019-01-26 07:30:13 -08:00 committed by GitHub
commit 8bce3620b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -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}