diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 3dc2ae2d11b..1a6b4abb837 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1950,14 +1950,6 @@ restart count to 1. release: v1.9 file: test/e2e/common/node/container_probe.go -- testname: Pod liveness probe, container exec timeout, restart - codename: '[sig-node] Probing container should be restarted with an exec liveness - probe with timeout [NodeConformance] [Conformance]' - description: A Pod is created with liveness probe with a Exec action on the Pod. - If the liveness probe call does not return within the timeout specified, liveness - probe MUST restart the Pod. - release: v1.9 - file: test/e2e/common/node/container_probe.go - testname: Pod liveness probe, using http endpoint, multiple restarts (slow) codename: '[sig-node] Probing container should have monotonically increasing restart count [NodeConformance] [Conformance]' @@ -1970,14 +1962,6 @@ everytime health check fails, measure upto 5 restart. release: v1.9 file: test/e2e/common/node/container_probe.go -- testname: Pod readiness probe, container exec timeout, not ready - codename: '[sig-node] Probing container should not be ready with an exec readiness - probe timeout [NodeConformance] [Conformance]' - description: A Pod is created with readiness probe with a Exec action on the Pod. - If the readiness probe call does not return within the timeout specified, readiness - probe MUST not be Ready. - release: v1.20 - file: test/e2e/common/node/container_probe.go - testname: Pod readiness probe, with initial delay codename: '[sig-node] Probing container with readiness probe should not be ready before initial delay and never restart [NodeConformance] [Conformance]' diff --git a/test/e2e/common/node/container_probe.go b/test/e2e/common/node/container_probe.go index 20aa75b8e87..239b76aead0 100644 --- a/test/e2e/common/node/container_probe.go +++ b/test/e2e/common/node/container_probe.go @@ -213,7 +213,7 @@ var _ = SIGDescribe("Probing container", func() { Testname: Pod liveness probe, container exec timeout, restart Description: A Pod is created with liveness probe with a Exec action on the Pod. If the liveness probe call does not return within the timeout specified, liveness probe MUST restart the Pod. */ - framework.ConformanceIt("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() { + ginkgo.It("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() { cmd := []string{"/bin/sh", "-c", "sleep 600"} livenessProbe := &v1.Probe{ Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), @@ -230,7 +230,7 @@ var _ = SIGDescribe("Probing container", func() { Testname: Pod readiness probe, container exec timeout, not ready Description: A Pod is created with readiness probe with a Exec action on the Pod. If the readiness probe call does not return within the timeout specified, readiness probe MUST not be Ready. */ - framework.ConformanceIt("should not be ready with an exec readiness probe timeout [NodeConformance]", func() { + ginkgo.It("should not be ready with an exec readiness probe timeout [NodeConformance]", func() { cmd := []string{"/bin/sh", "-c", "sleep 600"} readinessProbe := &v1.Probe{ Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}),