diff --git a/test/e2e/load.go b/test/e2e/load.go index f34883a5b9a..67944a49927 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -157,6 +157,7 @@ func generateRCConfigsForGroup(c *client.Client, ns, groupName string, size, cou Client: c, Name: groupName + "-" + strconv.Itoa(i), Namespace: ns, + Timeout: 10 * time.Minute, Image: image, Replicas: size, } diff --git a/test/e2e/util.go b/test/e2e/util.go index bb36c209c78..1f4dc6341c1 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -157,6 +157,7 @@ type RCConfig struct { Name string Namespace string PollInterval time.Duration + Timeout time.Duration PodStatusFile *os.File Replicas int @@ -966,10 +967,14 @@ func RunRC(config RCConfig) error { if interval <= 0 { interval = 10 * time.Second } + timeout := config.Timeout + if timeout <= 0 { + timeout = 5 * time.Minute + } oldPods := make([]*api.Pod, 0) oldRunning := 0 lastChange := time.Now() - for oldRunning != config.Replicas && time.Since(lastChange) < 5*time.Minute { + for oldRunning != config.Replicas && time.Since(lastChange) < timeout { time.Sleep(interval) running := 0