diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index a91cea67962..f08d4450b4e 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -261,7 +261,6 @@ test/e2e/network/service.go: "should be able to change the type from ClusterIP t test/e2e/network/service.go: "should be able to change the type from NodePort to ExternalName" test/e2e/network/service_latency.go: "should not be very high" test/e2e/node/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running" -test/e2e/node/pods.go: "should be submitted and removed" test/e2e/node/pods.go: "should be set on Pods with matching resource requests and limits for memory and cpu" test/e2e/node/pre_stop.go: "should call prestop when killing a pod" test/e2e/scheduling/predicates.go: "validates resource limits of pods that are allowed to run" diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go index f63fb7885c8..432c20a3910 100644 --- a/test/e2e/node/pods.go +++ b/test/e2e/node/pods.go @@ -49,7 +49,7 @@ var _ = SIGDescribe("Pods Extended", func() { Testname: Pods, delete grace period Description: Create a pod, make sure it is running. Using the http client send a ‘delete’ with gracePeriodSeconds=30. Pod SHOULD get deleted within 30 seconds. */ - framework.ConformanceIt("should be submitted and removed", func() { + ginkgo.It("should be submitted and removed [Flaky]", func() { ginkgo.By("creating the pod") name := "pod-submit-remove-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond())