Merge pull request #25695 from Random-Liu/skip-runtime-conformance-test

Automatic merge from submit-queue Node E2E: Shorten consistently check timeout of runtime conformance test #24191 increased the node e2e running time by almost half an hour. It makes the test running time exceed 60 minutes timeout, which causes quite a few issues (See https://github.com/kubernetes/kubernetes/issues/25639). As a quite fix, we'll skip all the runtime conformance test. @liangchenye We should remove redundant test cases in #24191 such as https://github.com/kubernetes/kubernetes/pull/24191#discussion_r62968819, and reduce the test running time as much as possible.

Merge pull request #25695 from Random-Liu/skip-runtime-conformance-test
7a089c3e · k8s-merge-robot · 445deb21 · d1ab3b7f · 7a089c3e
Commit 7a089c3e authored May 16, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

runtime_conformance_test.go test/e2e_node/runtime_conformance_test.go +5 -4

No files found.
--- a/test/e2e_node/runtime_conformance_test.go
+++ b/test/e2e_node/runtime_conformance_test.go
@@ -32,8 +32,9 @@ import (
 )
 const (
-	retryTimeout = time.Minute * 5
+	consistentCheckTimeout = time.Second * 20
-	pollInterval = time.Second * 5
+	retryTimeout           = time.Minute * 5
+	pollInterval           = time.Second * 5
 )
 type testStatus struct {
@@ -176,7 +177,7 @@ var _ = Describe("Container runtime Conformance Test", func() {
 					Consistently(func() api.PodPhase {
 						status, phase, err = runningContainer.GetStatus()
 						return phase
-					}, retryTimeout, pollInterval).Should(Equal(testStatus.Phase))
+					}, consistentCheckTimeout, pollInterval).Should(Equal(testStatus.Phase))
 					Expect(err).NotTo(HaveOccurred())
 					By("it should get the expected 'RestartCount'")
@@ -282,7 +283,7 @@ var _ = Describe("Container runtime Conformance Test", func() {
 					} else {
 						return phase
 					}
-				}, retryTimeout, pollInterval).Should(Equal(testStatus.Phase))
+				}, consistentCheckTimeout, pollInterval).Should(Equal(testStatus.Phase))
 				Expect(err).NotTo(HaveOccurred())
 				By("it should get the expected 'RestartCount'")