From bf93190c6962e4ee7f95bb6112b272db3c32b73b Mon Sep 17 00:00:00 2001 From: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> Date: Thu, 8 Jan 2026 15:27:48 +0000 Subject: [PATCH] UPSTREAM: : Remove openshift-redhat-marketplace catalog tests Removes all test references to the openshift-redhat-marketplace ClusterCatalog which has been removed from the default catalogs. Changes: - Updated catalog list in olmv1-catalog.go - Removed marketplace /v1/api/all endpoint test - Removed marketplace /v1/api/metas endpoint test - Removed marketplace check from QE test PolarionID:77413 --- .../openshift_payload_olmv1.json | 20 --------------- openshift/tests-extension/cmd/main.go | 6 +++-- .../tests-extension/test/olmv1-catalog.go | 25 ------------------- .../tests-extension/test/qe/specs/olmv1_cc.go | 2 -- 4 files changed, 4 insertions(+), 49 deletions(-) diff --git a/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json b/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json index 01687668b..4b6f62f38 100644 --- a/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json +++ b/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json @@ -852,16 +852,6 @@ "lifecycle": "blocking", "environmentSelector": {} }, - { - "name": "[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 openshift-redhat-marketplace Catalog should serve FBC via the /v1/api/all endpoint", - "labels": {}, - "resources": { - "isolation": {} - }, - "source": "openshift:payload:olmv1", - "lifecycle": "blocking", - "environmentSelector": {} - }, { "name": "[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 openshift-redhat-operators Catalog should serve FBC via the /v1/api/all endpoint", "labels": {}, @@ -892,16 +882,6 @@ "lifecycle": "blocking", "environmentSelector": {} }, - { - "name": "[sig-olmv1][OCPFeatureGate:NewOLMCatalogdAPIV1Metas][Skipped:Disconnected] OLMv1 openshift-redhat-marketplace Catalog should serve FBC via the /v1/api/metas endpoint", - "labels": {}, - "resources": { - "isolation": {} - }, - "source": "openshift:payload:olmv1", - "lifecycle": "blocking", - "environmentSelector": {} - }, { "name": "[sig-olmv1][OCPFeatureGate:NewOLMCatalogdAPIV1Metas][Skipped:Disconnected] OLMv1 openshift-redhat-operators Catalog should serve FBC via the /v1/api/metas endpoint", "labels": {}, diff --git a/openshift/tests-extension/cmd/main.go b/openshift/tests-extension/cmd/main.go index 450c7e79e..b92c4c6ae 100644 --- a/openshift/tests-extension/cmd/main.go +++ b/openshift/tests-extension/cmd/main.go @@ -275,8 +275,10 @@ func main() { // 3 - Remove the test in your test file. // 4 - Run make build-update ext.IgnoreObsoleteTests( - // "[sig-olmv1] OLMv1 should pass a trivial sanity check", - // Add more removed test names below + // "[sig-olmv1] OLMv1 should pass a trivial sanity check", + // Removed marketplace catalog tests (marketplace catalog removed from default catalogs) + "[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 openshift-redhat-marketplace Catalog should serve FBC via the /v1/api/all endpoint", + "[sig-olmv1][OCPFeatureGate:NewOLMCatalogdAPIV1Metas][Skipped:Disconnected] OLMv1 openshift-redhat-marketplace Catalog should serve FBC via the /v1/api/metas endpoint", ) // Initialize the environment before running any tests. diff --git a/openshift/tests-extension/test/olmv1-catalog.go b/openshift/tests-extension/test/olmv1-catalog.go index cba96594b..5e1bfab1b 100644 --- a/openshift/tests-extension/test/olmv1-catalog.go +++ b/openshift/tests-extension/test/olmv1-catalog.go @@ -38,7 +38,6 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 catalogs := []string{ "openshift-certified-operators", "openshift-community-operators", - "openshift-redhat-marketplace", "openshift-redhat-operators", } @@ -125,18 +124,6 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 }) }) -var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 openshift-redhat-marketplace Catalog", func() { - BeforeEach(func() { - helpers.RequireOLMv1CapabilityOnOpenshift() - if !env.Get().IsOpenShift { - Skip("This test requires OpenShift Catalogs") - } - }) - It("should serve FBC via the /v1/api/all endpoint", func(ctx SpecContext) { - verifyCatalogEndpoint(ctx, "openshift-redhat-marketplace", "all", "") - }) -}) - var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 openshift-redhat-operators Catalog", func() { BeforeEach(func() { helpers.RequireOLMv1CapabilityOnOpenshift() @@ -173,18 +160,6 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMCatalogdAPIV1Metas][Skipped:D }) }) -var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMCatalogdAPIV1Metas][Skipped:Disconnected] OLMv1 openshift-redhat-marketplace Catalog", func() { - BeforeEach(func() { - helpers.RequireOLMv1CapabilityOnOpenshift() - if !env.Get().IsOpenShift { - Skip("This test requires OpenShift Catalogs") - } - }) - It("should serve FBC via the /v1/api/metas endpoint", func(ctx SpecContext) { - verifyCatalogEndpoint(ctx, "openshift-redhat-marketplace", "metas", "?schema=olm.package") - }) -}) - var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMCatalogdAPIV1Metas][Skipped:Disconnected] OLMv1 openshift-redhat-operators Catalog", func() { BeforeEach(func() { helpers.RequireOLMv1CapabilityOnOpenshift() diff --git a/openshift/tests-extension/test/qe/specs/olmv1_cc.go b/openshift/tests-extension/test/qe/specs/olmv1_cc.go index 134fafd0c..0e95ad47f 100644 --- a/openshift/tests-extension/test/qe/specs/olmv1_cc.go +++ b/openshift/tests-extension/test/qe/specs/olmv1_cc.go @@ -136,8 +136,6 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clustercatalog", g.Label("NonHyperShif []string{"clustercatalog", "openshift-community-operators", `-o=jsonpath={.status.conditions[?(@.type=="Serving")].status}`}), olmv1util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Contain, "True", exutil.Ok, []string{"clustercatalog", "openshift-redhat-operators", `-o=jsonpath={.status.conditions[?(@.type=="Serving")].status}`}), - olmv1util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Contain, "True", exutil.Ok, - []string{"clustercatalog", "openshift-redhat-marketplace", `-o=jsonpath={.status.conditions[?(@.type=="Serving")].status}`}), } for _, check := range checks { check.Check(oc)