From 38df6fcd3d54051e97e171adef88b8d82c9dd1b8 Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Fri, 22 Jul 2022 12:07:53 +0200 Subject: [PATCH] Revert "Promote APIService e2e test to Conformance" This reverts commit c4935571a5d2a676fab409100b5f3222c36feed1. --- test/conformance/testdata/conformance.yaml | 12 ------------ test/e2e/apimachinery/aggregator.go | 14 +------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 4a0263a0dc3..5240c9b1a14 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -160,18 +160,6 @@ 1.17 will work on the current Aggregator/API-Server. release: v1.17, v1.21 file: test/e2e/apimachinery/aggregator.go -- testname: Aggregator, manage lifecycle of an APIService - codename: '[sig-api-machinery] Aggregator should manage the lifecycle of an APIService - [Conformance]' - description: An APIService is created which MUST succeed. The APIService status - when replaced MUST succeed. Given the updating of the APIService status, the fields - MUST equal the new values. The APIService status when patched MUST succeed. Given - the patching of the APIService status, the fields MUST equal the new values. The - APIService when replaced MUST succeed. Given the updating of the APIService, the - fields MUST equal the new values. It MUST succeed at deleting a collection of - APIServices via a label selector. - release: v1.25 - file: test/e2e/apimachinery/aggregator.go - testname: Custom Resource Definition Conversion Webhook, convert mixed version list codename: '[sig-api-machinery] CustomResourceConversionWebhook [Privileged:ClusterAdmin] should be able to convert a non homogeneous list of CRs [Conformance]' diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 7c061ed6513..a88253d0733 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -108,19 +108,7 @@ var _ = SIGDescribe("Aggregator", func() { TestSampleAPIServer(f, aggrclient, imageutils.GetE2EImage(imageutils.APIServer)) }) - /* - Release: v1.25 - Testname: Aggregator, manage lifecycle of an APIService - Description: An APIService is created which MUST succeed. The - APIService status when replaced MUST succeed. Given the updating - of the APIService status, the fields MUST equal the new values. - The APIService status when patched MUST succeed. Given the patching - of the APIService status, the fields MUST equal the new values. The - APIService when replaced MUST succeed. Given the updating of the - APIService, the fields MUST equal the new values. It MUST succeed at - deleting a collection of APIServices via a label selector. - */ - framework.ConformanceIt("should manage the lifecycle of an APIService", func() { + ginkgo.It("should manage the lifecycle of an APIService", func() { ns := f.Namespace.Name framework.Logf("ns: %v", ns)