Merge pull request #67901 from dims/drop-flaky-test-from-conformance

test/conformance/testdata/conformance.txt

@@ -183,7 +183,6 @@ test/e2e/network/service.go: "should serve multiport endpoints from pods"
 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 submitted and removed"
 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"
 test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if not matching"

test/e2e/node/pods.go

@@ -46,13 +46,13 @@ var _ = SIGDescribe("Pods Extended", func() {
 		BeforeEach(func() {
 			podClient = f.PodClient()
 		})
-		// Flaky issue #36821.
+		// TODO: Fix Flaky issue #68066 and then re-add this back into Conformance Suite
 		/*
 			Release : v1.9
 			Testname: Pods, delete grace period
 			Description: Create a pod, make sure it is running, create a watch to observe Pod creation. Create a 'kubectl local proxy', capture the port the proxy is listening. Using the http client send a ‘delete’ with gracePeriodSeconds=30. Pod SHOULD get deleted within 30 seconds.
 		*/
-		framework.ConformanceIt("should be submitted and removed  [Flaky]", func() {
+		It("should be submitted and removed  [Flaky]", func() {
 			By("creating the pod")
 			name := "pod-submit-remove-" + string(uuid.NewUUID())
 			value := strconv.Itoa(time.Now().Nanosecond())