Skip to content

OPRUN-4385: Remove marketplace index #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
camilamacedo86 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

OPRUN-4385: Remove marketplace index #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
699aa15
UPSTREAM: <carry>: Remove marketplace index
camilamacedo86 Jan 8, 2026
04585dc
UPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
camilamacedo86 Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-marketplace.yml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions openshift/catalogd/manifests-experimental.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,19 +1020,6 @@ spec:
pollIntervalMinutes: 10
ref: registry.redhat.io/redhat/community-operator-index:v4.21
---
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-marketplace.yml
apiVersion: olm.operatorframework.io/v1
kind: ClusterCatalog
metadata:
name: openshift-redhat-marketplace
spec:
priority: -300
source:
type: Image
image:
pollIntervalMinutes: 10
ref: registry.redhat.io/redhat/redhat-marketplace-index:v4.21
---
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml
apiVersion: olm.operatorframework.io/v1
kind: ClusterCatalog
Expand Down
13 changes: 0 additions & 13 deletions openshift/catalogd/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,19 +1019,6 @@ spec:
pollIntervalMinutes: 10
ref: registry.redhat.io/redhat/community-operator-index:v4.21
---
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-marketplace.yml
apiVersion: olm.operatorframework.io/v1
kind: ClusterCatalog
metadata:
name: openshift-redhat-marketplace
spec:
priority: -300
source:
type: Image
image:
pollIntervalMinutes: 10
ref: registry.redhat.io/redhat/redhat-marketplace-index:v4.21
---
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml
apiVersion: olm.operatorframework.io/v1
kind: ClusterCatalog
Expand Down
20 changes: 0 additions & 20 deletions openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down Expand Up @@ -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": {},
Expand Down
6 changes: 4 additions & 2 deletions openshift/tests-extension/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
25 changes: 0 additions & 25 deletions openshift/tests-extension/test/olmv1-catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions openshift/tests-extension/test/qe/specs/olmv1_cc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down