From bc783aaeb71f11f9639a2ca8fb3908a88be47d88 Mon Sep 17 00:00:00 2001
From: Stephen Heywood <stephen@ii.coop>
Date: Wed, 20 Jul 2022 11:29:43 +1200
Subject: [PATCH] Promote ResourceQuota e2e test to Conformance

---
 test/conformance/testdata/conformance.yaml | 11 +++++++++++
 test/e2e/apimachinery/resource_quota.go    | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
index bab0afcbac8..5240c9b1a14 100755
--- a/test/conformance/testdata/conformance.yaml
+++ b/test/conformance/testdata/conformance.yaml
@@ -492,6 +492,17 @@
     MUST match to expected used and total allowed resource quota count within namespace.
   release: v1.16
   file: test/e2e/apimachinery/resource_quota.go
+- testname: ResourceQuota, manage lifecycle of a ResourceQuota
+  codename: '[sig-api-machinery] ResourceQuota should manage the lifecycle of a ResourceQuota
+    [Conformance]'
+  description: Attempt to create a ResourceQuota for CPU and Memory quota limits.
+    Creation MUST be successful. Attempt to list all namespaces with a label selector
+    which MUST succeed. One list MUST be found. The ResourceQuota when patched MUST
+    succeed. Given the patching of the ResourceQuota, the fields MUST equal the new
+    values. It MUST succeed at deleting a collection of ResourceQuota via a label
+    selector.
+  release: v1.25
+  file: test/e2e/apimachinery/resource_quota.go
 - testname: ResourceQuota, quota scope, BestEffort and NotBestEffort scope
   codename: '[sig-api-machinery] ResourceQuota should verify ResourceQuota with best
     effort scope. [Conformance]'
diff --git a/test/e2e/apimachinery/resource_quota.go b/test/e2e/apimachinery/resource_quota.go
index dca47d3bf60..3d6ed640adc 100644
--- a/test/e2e/apimachinery/resource_quota.go
+++ b/test/e2e/apimachinery/resource_quota.go
@@ -919,7 +919,18 @@ var _ = SIGDescribe("ResourceQuota", func() {
 		}
 	})
 
-	ginkgo.It("should manage the lifecycle of a ResourceQuota", func() {
+	/*
+		Release: v1.25
+		Testname: ResourceQuota, manage lifecycle of a ResourceQuota
+		Description: Attempt to create a ResourceQuota for CPU and Memory
+		quota limits. Creation MUST be successful. Attempt to list all
+		namespaces with a label selector which MUST succeed. One list
+		MUST be found. The ResourceQuota when patched MUST succeed.
+		Given the patching of the ResourceQuota, the fields MUST equal
+		the new values. It MUST succeed at deleting a collection of
+		ResourceQuota via a label selector.
+	*/
+	framework.ConformanceIt("should manage the lifecycle of a ResourceQuota", func() {
 		client := f.ClientSet
 		ns := f.Namespace.Name