From c383dc7b1fb73bfdc40c3e7aac1b895735e41051 Mon Sep 17 00:00:00 2001 From: Hippie Hacker Date: Tue, 20 Oct 2020 11:56:03 +1300 Subject: [PATCH 1/2] Promote Replication Controller Lifecycle Co-Authored-By: Riaan Kleinhans --- test/e2e/apps/rc.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/e2e/apps/rc.go b/test/e2e/apps/rc.go index e34f0c38231..f9c5ae30674 100644 --- a/test/e2e/apps/rc.go +++ b/test/e2e/apps/rc.go @@ -99,7 +99,12 @@ var _ = SIGDescribe("ReplicationController", func() { testRCReleaseControlledNotMatching(f) }) - ginkgo.It("[Flaky] should test the lifecycle of a ReplicationController", func() { + /* + Release: v1.20 + Testname: Replication Controller, lifecycle + Description: A Replication Controller (RC) is created, read, patched, and deleted with verification. + */ + framework.ConformanceIt("should test the lifecycle of a ReplicationController", func() { testRcName := "rc-test" testRcNamespace := ns testRcInitialReplicaCount := int32(1) From 995583938a8ca7c84f907166d8510653d2190ee7 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Tue, 20 Oct 2020 12:24:52 +1300 Subject: [PATCH 2/2] Promote Replication Controller lifecycle e2e test to Conformance --- test/conformance/testdata/conformance.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 29bf2501000..832a8293923 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1260,6 +1260,13 @@ namespace quota. The creation MUST fail release: v1.15 file: test/e2e/apps/rc.go +- testname: Replication Controller, lifecycle + codename: '[sig-apps] ReplicationController should test the lifecycle of a ReplicationController + [Conformance]' + description: A Replication Controller (RC) is created, read, patched, and deleted + with verification. + release: v1.20 + file: test/e2e/apps/rc.go - testname: StatefulSet, Burst Scaling codename: '[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] Burst scaling should run to completion even with unhealthy pods [Slow] [Conformance]'