From a07d4460bf587d5771fa2df29ff5a628aec8769c Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 1 Apr 2021 23:18:45 -0400 Subject: [PATCH] Promote e2e eviction test to conformance --- test/conformance/testdata/conformance.yaml | 8 ++++++++ test/e2e/apps/disruption.go | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index aec70459a03..e840ff9ac8d 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -704,6 +704,14 @@ description: PodDisruptionBudget API must support list and deletecollection operations. release: v1.21 file: test/e2e/apps/disruption.go +- testname: 'PodDisruptionBudget: block an eviction until the PDB is updated to allow + it' + codename: '[sig-apps] DisruptionController should block an eviction until the PDB + is updated to allow it [Conformance]' + description: Eviction API must block an eviction until the PDB is updated to allow + it + release: v1.22 + file: test/e2e/apps/disruption.go - testname: 'PodDisruptionBudget: create, update, patch, and delete object' codename: '[sig-apps] DisruptionController should create a PodDisruptionBudget [Conformance]' description: PodDisruptionBudget API must support create, update, patch, and delete diff --git a/test/e2e/apps/disruption.go b/test/e2e/apps/disruption.go index 5b91d29d6c0..46ce07e5d46 100644 --- a/test/e2e/apps/disruption.go +++ b/test/e2e/apps/disruption.go @@ -314,7 +314,12 @@ var _ = SIGDescribe("DisruptionController", func() { }) } - ginkgo.It("should block an eviction until the PDB is updated to allow it", func() { + /* + Release : v1.22 + Testname: PodDisruptionBudget: block an eviction until the PDB is updated to allow it + Description: Eviction API must block an eviction until the PDB is updated to allow it + */ + framework.ConformanceIt("should block an eviction until the PDB is updated to allow it", func() { ginkgo.By("Creating a pdb that targets all three pods in a test replica set") createPDBMinAvailableOrDie(cs, ns, defaultName, intstr.FromInt(3), defaultLabels) createReplicaSetOrDie(cs, ns, 3, false)