From 40dadaaa9ccdd0b9bf8cefd58d6e2f7dfee37721 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Thu, 27 Feb 2020 11:14:02 +1300 Subject: [PATCH 1/5] Promote Pod Preemption Verification --- test/conformance/testdata/conformance.yaml | 9 +++++++++ test/e2e/scheduling/preemption.go | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index d69a8d3c366..b8f12dc36f5 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1708,6 +1708,15 @@ 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.17 + 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]' diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index ba898f625b3..95175abb9b8 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -499,7 +499,12 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { } }) - ginkgo.It("runs ReplicaSets to verify preemption running path", func() { + /* + Release: v1.17 + Testname: Pod preemption verification + 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. + */ + framework.ConformanceIt("runs ReplicaSets to verify preemption running path", func() { podNamesSeen := []int32{0, 0, 0} stopCh := make(chan struct{}) From 67fb7c598966b767814c781ee99c6d35a9e19645 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Thu, 27 Feb 2020 13:35:22 +1300 Subject: [PATCH 2/5] Fix release number --- test/conformance/testdata/conformance.yaml | 2 +- test/e2e/scheduling/preemption.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index b8f12dc36f5..3da3ab16261 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1715,7 +1715,7 @@ 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.17 + release: v1.18 file: test/e2e/scheduling/preemption.go - testname: Scheduler, resource limits codename: '[sig-scheduling] SchedulerPredicates [Serial] validates resource limits diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 95175abb9b8..2d29361ff11 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -500,7 +500,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { }) /* - Release: v1.17 + Release: v1.18 Testname: Pod preemption verification 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. */ From 51d3f64b81f8ed53897c24af4b0fc79c823d953e Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Mon, 2 Mar 2020 14:23:29 +1300 Subject: [PATCH 3/5] Fix conformance testdata --- test/conformance/testdata/conformance.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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]' From cdcff31585742c75baf8408663401d69d76e5364 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 25 Mar 2020 09:35:24 +1300 Subject: [PATCH 4/5] Update conformance metadata release version to v1.19 --- test/e2e/scheduling/preemption.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 2d29361ff11..2fac6a25dd3 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -500,7 +500,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { }) /* - Release: v1.18 + Release: v1.19 Testname: Pod preemption verification 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. */ From 63632118b7f23752c79fd74ebad2b755b4e53542 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 1 Apr 2020 09:43:56 +1300 Subject: [PATCH 5/5] Fix conformance testdata --- test/conformance/testdata/conformance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index a4de02cbf3a..191a9064184 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1765,7 +1765,7 @@ 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 + release: v1.19 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]