diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index 6967961a143..7aa0fea214c 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -952,12 +952,8 @@ func createPausePod(ctx context.Context, f *framework.Framework, conf pausePodCo } func runPausePod(ctx context.Context, f *framework.Framework, conf pausePodConfig) *v1.Pod { - return runPausePodWithTimeout(ctx, f, conf, framework.PollShortTimeout) -} - -func runPausePodWithTimeout(ctx context.Context, f *framework.Framework, conf pausePodConfig, timeout time.Duration) *v1.Pod { pod := createPausePod(ctx, f, conf) - framework.ExpectNoError(e2epod.WaitTimeoutForPodRunningInNamespace(ctx, f.ClientSet, pod.Name, pod.Namespace, timeout)) + framework.ExpectNoError(e2epod.WaitTimeoutForPodRunningInNamespace(ctx, f.ClientSet, pod.Name, pod.Namespace, f.Timeouts.PodStartShort)) pod, err := f.ClientSet.CoreV1().Pods(pod.Namespace).Get(ctx, conf.Name, metav1.GetOptions{}) framework.ExpectNoError(err) return pod diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 05cec6912d4..67edf9b090a 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -192,14 +192,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. - runPausePodWithTimeout(ctx, f, pausePodConfig{ + runPausePod(ctx, 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(ctx, pods[0].Name, metav1.GetOptions{}) podPreempted := (err != nil && apierrors.IsNotFound(err)) || @@ -290,7 +290,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { framework.Failf("Error cleanup pod `%s/%s`: %v", metav1.NamespaceSystem, "critical-pod", err) } }() - runPausePodWithTimeout(ctx, f, pausePodConfig{ + runPausePod(ctx, f, pausePodConfig{ Name: "critical-pod", Namespace: metav1.NamespaceSystem, PriorityClassName: scheduling.SystemClusterCritical, @@ -298,7 +298,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { Requests: podRes, Limits: podRes, }, - }, framework.PodStartShortTimeout) + }) defer func() { // Clean-up the critical pod