From 337bba200c854dcad45f9b245b82c2ededd0158c Mon Sep 17 00:00:00 2001
From: Stephen Heywood <stephen@ii.coop>
Date: Wed, 27 Jul 2022 14:47:32 +1200
Subject: [PATCH] Promote ControllerRevision e2e test to Conformance

---
 test/conformance/testdata/conformance.yaml | 16 ++++++++++++++++
 test/e2e/apps/controller_revision.go       | 19 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
index 5240c9b1a14..f2ab632f0d8 100755
--- a/test/conformance/testdata/conformance.yaml
+++ b/test/conformance/testdata/conformance.yaml
@@ -594,6 +594,22 @@
     and minor versions MUST only be an integer.
   release: v1.19
   file: test/e2e/apimachinery/server_version.go
+- testname: ControllerRevision, resource lifecycle
+  codename: '[sig-apps] ControllerRevision [Serial] should manage the lifecycle of
+    a ControllerRevision [Conformance]'
+  description: Creating a DaemonSet MUST succeed. Listing all ControllerRevisions
+    with a label selector MUST find only one. After patching the ControllerRevision
+    with a new label, the label MUST be found. Creating a new ControllerRevision for
+    the DaemonSet MUST succeed. Listing the ControllerRevisions by label selector
+    MUST find only two. Deleting a ControllerRevision MUST succeed. Listing the ControllerRevisions
+    by label selector MUST find only one. After updating the ControllerRevision with
+    a new label, the label MUST be found. Patching the DaemonSet MUST succeed. Listing
+    the ControllerRevisions by label selector MUST find only two. Deleting a collection
+    of ControllerRevision via a label selector MUST succeed. Listing the ControllerRevisions
+    by label selector MUST find only one. The current ControllerRevision revision
+    MUST be 3.
+  release: v1.25
+  file: test/e2e/apps/controller_revision.go
 - testname: CronJob Suspend
   codename: '[sig-apps] CronJob should not schedule jobs when suspended [Slow] [Conformance]'
   description: CronJob MUST support suspension, which suppresses creation of new jobs.
diff --git a/test/e2e/apps/controller_revision.go b/test/e2e/apps/controller_revision.go
index 9b269972e86..64d0d290735 100644
--- a/test/e2e/apps/controller_revision.go
+++ b/test/e2e/apps/controller_revision.go
@@ -104,7 +104,24 @@ var _ = SIGDescribe("ControllerRevision [Serial]", func() {
 		framework.ExpectNoError(err)
 	})
 
-	ginkgo.It("should manage the lifecycle of a ControllerRevision", func() {
+	/*
+		Release: v1.25
+		Testname: ControllerRevision, resource lifecycle
+		Description: Creating a DaemonSet MUST succeed. Listing all
+		ControllerRevisions with a label selector MUST find only one.
+		After patching the ControllerRevision with a new label, the label
+		MUST be found. Creating a new ControllerRevision for the DaemonSet
+		MUST succeed. Listing the ControllerRevisions by label selector
+		MUST find only two. Deleting a ControllerRevision MUST succeed.
+		Listing the ControllerRevisions by label selector MUST find only
+		one. After updating the ControllerRevision with a new label, the
+		label MUST be found. Patching the DaemonSet MUST succeed. Listing the
+		ControllerRevisions by label selector MUST find only two. Deleting
+		a collection of ControllerRevision via a label selector MUST succeed.
+		Listing the ControllerRevisions by label selector MUST find only one.
+		The current ControllerRevision revision MUST be 3.
+	*/
+	framework.ConformanceIt("should manage the lifecycle of a ControllerRevision", func() {
 		csAppsV1 := f.ClientSet.AppsV1()
 
 		dsLabel := map[string]string{"daemonset-name": dsName}