Skip to content

K
k3s
Commit 4b0c0bd9 authored by Maciej Szulik's avatar Maciej Szulik
Browse files
Options

Shorten initial pod start time to 30s in e2e, since 4566 is closed

parent 18df4510
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
test/e2e/framework/util.go
View file @ 4b0c0bd9
...@@ -86,8 +86,7 @@ const ( ...@@ -86,8 +86,7 @@ const (
// How long to wait for the pod to be listable // How long to wait for the pod to be listable
PodListTimeout = time.Minute PodListTimeout = time.Minute
// Initial pod start can be delayed O(minutes) by slow docker pulls // Initial pod start can be delayed O(minutes) by slow docker pulls
// TODO: Make this 30 seconds once #4566 is resolved. PodStartTimeout = 30 * time.Second
PodStartTimeout = 5 * time.Minute
// How long to wait for the pod to no longer be running // How long to wait for the pod to no longer be running
podNoLongerRunningTimeout = 30 * time.Second podNoLongerRunningTimeout = 30 * time.Second
......
test/e2e/pods.go
View file @ 4b0c0bd9
...@@ -815,7 +815,7 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -815,7 +815,7 @@ var _ = framework.KubeDescribe("Pods", func() {
wr := watch.NewRecorder(w) wr := watch.NewRecorder(w)
event, err := watch.Until( event, err := watch.Until(
framework.PodStartTimeout, wr, framework.PodReadyBeforeTimeout, wr,
// check for the first container to fail at least once // check for the first container to fail at least once
func(evt watch.Event) (bool, error) { func(evt watch.Event) (bool, error) {
switch t := evt.Object.(type) { switch t := evt.Object.(type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment