github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
k8s-merge-robot 2016-05-16 19:38:47 -07:00
commit 7a089c3e4f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e_node/runtime_conformance_test.go
View File

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