Skip to content

Commit 699de8a

Browse files
Merge pull request #29074 from vrutkovs/cert-rotation-required-tests
OCPBUGS-60853: make TLS registry tests required
2 parents 3581fe4 + 09225dd commit 699de8a

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

test/extended/operators/certs.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,9 @@ var _ = g.Describe(fmt.Sprintf("[sig-arch][Late][Jira:%q]", "kube-apiserver"), g
269269
if len(newTLSRegistry.CertKeyPairs) > 0 || len(newTLSRegistry.CertificateAuthorityBundles) > 0 {
270270
registryString, err := json.MarshalIndent(newTLSRegistry, "", " ")
271271
if err != nil {
272-
//g.Fail("Failed to marshal registry %#v: %v", newTLSRegistry, err)
273-
testresult.Flakef("Failed to marshal registry %#v: %v", newTLSRegistry, err)
272+
g.Fail(fmt.Sprintf("Failed to marshal registry %#v: %v", newTLSRegistry, err))
274273
}
275-
// TODO: uncomment when test no longer fails and enhancement is merged
276-
//g.Fail(fmt.Sprintf("Unregistered TLS certificates:\n%s", registryString))
277-
testresult.Flakef("Unregistered TLS certificates found:\n%s\nSee tls/ownership/README.md in origin repo", registryString)
274+
g.Fail(fmt.Sprintf("Unregistered TLS certificates found:\n%s\nSee tls/ownership/README.md in origin repo", registryString))
278275
}
279276
})
280277

@@ -284,9 +281,7 @@ var _ = g.Describe(fmt.Sprintf("[sig-arch][Late][Jira:%q]", "kube-apiserver"), g
284281
o.Expect(err).NotTo(o.HaveOccurred())
285282

286283
if len(messages) > 0 {
287-
// TODO: uncomment when test no longer fails and enhancement is merged
288-
//g.Fail(strings.Join(messages, "\n"))
289-
testresult.Flakef("%s", strings.Join(messages, "\n"))
284+
g.Fail(strings.Join(messages, "\n"))
290285
}
291286
})
292287

0 commit comments

Comments
 (0)