From d34d4755ae269e8e044393af40be42b98f3a6027 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Mon, 15 May 2023 09:53:31 +1200 Subject: [PATCH] Promote APIResources e2e test to Conformance --- test/conformance/testdata/conformance.yaml | 8 ++++++++ test/e2e/apimachinery/discovery.go | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index ad6d61a90d2..b0e07c0af45 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -312,6 +312,14 @@ definitions MUST be published for custom resource definitions. release: v1.16 file: test/e2e/apimachinery/crd_publish_openapi.go +- testname: Discovery, confirm the groupVerion and a resourcefrom each apiGroup + codename: '[sig-api-machinery] Discovery should locate the groupVersion and a resource + within each APIGroup [Conformance]' + description: A resourceList MUST be found for each apiGroup that is retrieved. For + each apiGroup the groupVersion MUST equal the groupVersion as reported by the + schema. From each resourceList a valid resource MUST be found. + release: v1.28 + file: test/e2e/apimachinery/discovery.go - testname: Discovery, confirm the PreferredVersion for each api group codename: '[sig-api-machinery] Discovery should validate PreferredVersion for each APIGroup [Conformance]' diff --git a/test/e2e/apimachinery/discovery.go b/test/e2e/apimachinery/discovery.go index 0b95fa4b022..72e6807906f 100644 --- a/test/e2e/apimachinery/discovery.go +++ b/test/e2e/apimachinery/discovery.go @@ -159,7 +159,14 @@ var _ = SIGDescribe("Discovery", func() { } }) - ginkgo.It("should locate the groupVersion and a resource within each APIGroup", func(ctx context.Context) { + /* + Release: v1.28 + Testname: Discovery, confirm the groupVerion and a resourcefrom each apiGroup + Description: A resourceList MUST be found for each apiGroup that is retrieved. + For each apiGroup the groupVersion MUST equal the groupVersion as reported by + the schema. From each resourceList a valid resource MUST be found. + */ + framework.ConformanceIt("should locate the groupVersion and a resource within each APIGroup", func(ctx context.Context) { tests := []struct { apiBasePath string