diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index 652d8f4158317..4f66cafab2d86 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -934,8 +934,12 @@ func createPausePod(f *framework.Framework, conf pausePodConfig) *v1.Pod { } func runPausePod(f *framework.Framework, conf pausePodConfig) *v1.Pod { + return runPausePodWithTimeout(f, conf, framework.PollShortTimeout) +} + +func runPausePodWithTimeout(f *framework.Framework, conf pausePodConfig, timeout time.Duration) *v1.Pod { pod := createPausePod(f, conf) - framework.ExpectNoError(e2epod.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PollShortTimeout)) + framework.ExpectNoError(e2epod.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, timeout)) pod, err := f.ClientSet.CoreV1().Pods(pod.Namespace).Get(context.TODO(), conf.Name, metav1.GetOptions{}) framework.ExpectNoError(err) return pod diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 8cdf2e4d68672..d23d0f4061940 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -178,14 +178,14 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { ginkgo.By("Run a high priority pod that has same requirements as that of lower priority pod") // Create a high priority pod and make sure it is scheduled on the same node as the low priority pod. - runPausePod(f, pausePodConfig{ + runPausePodWithTimeout(f, pausePodConfig{ Name: "preemptor-pod", PriorityClassName: highPriorityClassName, Resources: &v1.ResourceRequirements{ Requests: podRes, Limits: podRes, }, - }) + }, framework.PodStartShortTimeout) preemptedPod, err := cs.CoreV1().Pods(pods[0].Namespace).Get(context.TODO(), pods[0].Name, metav1.GetOptions{}) podPreempted := (err != nil && apierrors.IsNotFound(err)) || @@ -271,7 +271,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { framework.Failf("Error cleanup pod `%s/%s`: %v", metav1.NamespaceSystem, "critical-pod", err) } }() - runPausePod(f, pausePodConfig{ + runPausePodWithTimeout(f, pausePodConfig{ Name: "critical-pod", Namespace: metav1.NamespaceSystem, PriorityClassName: scheduling.SystemClusterCritical, @@ -279,7 +279,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { Requests: podRes, Limits: podRes, }, - }) + }, framework.PodStartShortTimeout) defer func() { // Clean-up the critical pod