Skip to content

OCPBUGS-61515: UPSTREAM: 135372: Re-enable temporarily disabled SchedulerPreemption test #2524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ingvagabund wants to merge 2 commits into
base: master
Choose a base branch
from
Open

OCPBUGS-61515: UPSTREAM: 135372: Re-enable temporarily disabled SchedulerPreemption test #2524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de36d08
UPSTREAM: 135372: fix(SchedulerPreemption/Async): schedule all medium…
ingvagabund Nov 20, 2025
cfa45c7
UPSTREAM: 135372: fix(SchedulerPreemption/Async): schedule all medium…
ingvagabund Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions openshift-hack/cmd/k8s-tests-ext/disabled_tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
},
// tests that need to be temporarily disabled while the rebase is in progress.
"RebaseInProgress": {
// https://issues.redhat.com/browse/OCPBUGS-61515
"[sig-scheduling] SchedulerPreemption [Serial] validates various priority Pods preempt expectedly with the async preemption [Feature:SchedulerAsyncPreemption] [FeatureGate:SchedulerAsyncPreemption] [Beta]",

// https://issues.redhat.com/browse/OCPBUGS-61378
"[sig-network] Conntrack should be able to cleanup conntrack entries when UDP service target port changes for a NodePort service",

Expand Down
31 changes: 17 additions & 14 deletions test/e2e/scheduling/preemption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ var _ = SIGDescribe("SchedulerPreemption", framework.WithSerial(), func() {
highPriorityPods := make([]*v1.Pod, 0, 5*nodeListLen)
mediumPriorityPods := make([]*v1.Pod, 0, 10*nodeListLen)

ginkgo.By("Run high/medium priority pods that have same requirements as that of lower priority pod")
ginkgo.By("Run medium priority pods that have same requirements as that of lower priority pod")
for i := range nodeList.Items {
// Create medium priority pods first
// to confirm the scheduler finally prioritize the high priority pods, ignoring the medium priority pods.
Expand All @@ -391,19 +391,6 @@ var _ = SIGDescribe("SchedulerPreemption", framework.WithSerial(), func() {
})
mediumPriorityPods = append(mediumPriorityPods, p)
}

for j := 0; j < 5; j++ {
p := createPausePod(ctx, f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%d-%v", i, j, highPriorityClassName),
PriorityClassName: highPriorityClassName,
Resources: &v1.ResourceRequirements{
// Set the pod request to the low priority pod's resources
Requests: lowPriorityPods[0].Spec.Containers[0].Resources.Requests,
Limits: lowPriorityPods[0].Spec.Containers[0].Resources.Requests,
},
})
highPriorityPods = append(highPriorityPods, p)
}
}

// All low priority Pods should be the target of preemption.
Expand All @@ -419,6 +406,22 @@ var _ = SIGDescribe("SchedulerPreemption", framework.WithSerial(), func() {
}))
}

ginkgo.By("Run high priority pods that have same requirements as that of lower priority pod")
for i := range nodeList.Items {
for j := 0; j < 5; j++ {
p := createPausePod(ctx, f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%d-%v", i, j, highPriorityClassName),
PriorityClassName: highPriorityClassName,
Resources: &v1.ResourceRequirements{
// Set the pod request to the low priority pod's resources
Requests: lowPriorityPods[0].Spec.Containers[0].Resources.Requests,
Limits: lowPriorityPods[0].Spec.Containers[0].Resources.Requests,
},
})
highPriorityPods = append(highPriorityPods, p)
}
}

// All high priority Pods should be schedulable by removing the low priority Pods.
ginkgo.By("Wait for high priority pods to be ready for the preemption.")
for _, pod := range highPriorityPods {
Expand Down