diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 3da3ab16261..a4de02cbf3a 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1708,15 +1708,6 @@ be evicted if the taint is removed before toleration time ends. release: v1.16 file: test/e2e/scheduling/taints.go -- testname: Pod preemption verification - codename: '[sig-scheduling] PreemptionExecutionPath runs ReplicaSets to verify preemption - running path [Conformance]' - description: Four levels of Pods in ReplicaSets with different levels of Priority, - restricted by given CPU limits MUST launch. Priority 1 - 3 Pods MUST spawn first - followed by Priority 4 Pod. The ReplicaSets with Replicas MUST contain the expected - number of Replicas. - release: v1.18 - file: test/e2e/scheduling/preemption.go - testname: Scheduler, resource limits codename: '[sig-scheduling] SchedulerPredicates [Serial] validates resource limits of pods that are allowed to run [Conformance]' @@ -1767,6 +1758,15 @@ same node if the HostIP or Protocol is different. release: v1.16 file: test/e2e/scheduling/predicates.go +- testname: Pod preemption verification + codename: '[sig-scheduling] SchedulerPreemption [Serial] PreemptionExecutionPath + runs ReplicaSets to verify preemption running path [Conformance]' + description: Four levels of Pods in ReplicaSets with different levels of Priority, + restricted by given CPU limits MUST launch. Priority 1 - 3 Pods MUST spawn first + followed by Priority 4 Pod. The ReplicaSets with Replicas MUST contain the expected + number of Replicas. + release: v1.18 + file: test/e2e/scheduling/preemption.go - testname: ConfigMap Volume, text data, binary data codename: '[sig-storage] ConfigMap binary data should be reflected in volume [NodeConformance] [Conformance]'