Skip to content

OCPBUGS-57019 OPRUN-3946: [Default Catalog Consistency Test]: cleanups and enhancements: Add output xml to the gitignore and remove unused code from Makefile #372

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

Merged
merged 1 commit into from
Jun 4, 2025
Merged

OCPBUGS-57019 OPRUN-3946: [Default Catalog Consistency Test]: cleanups and enhancements: Add output xml to the gitignore and remove unused code from Makefile #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions openshift/default-catalog-consistency/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Binaries for programs and plugins
bin/*

# Output from tests
*.xml
7 changes: 0 additions & 7 deletions openshift/default-catalog-consistency/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ help: #HELP Display essential help.
@awk 'BEGIN {FS = ":[^#]*#HELP"; printf "\nUsage:\n make \033[36m<target>\033[0m\n\n"} /^[a-zA-Z_0-9-]+:.*#HELP / { printf " \033[36m%-17s\033[0m %s\n", $$1, $$2 } ' $(MAKEFILE_LIST)

#SECTION Tests

# Set the Ginkgo binary path. Assumes it's installed via `go install`
GOBIN ?= $(shell go env GOBIN)
ifeq ($(GOBIN),)
GOBIN := $(shell go env GOPATH)/bin
endif

TOOLS_BIN_DIR := $(CURDIR)/bin
GINKGO := $(TOOLS_BIN_DIR)/ginkgo

Expand Down
4 changes: 2 additions & 2 deletions openshift/default-catalog-consistency/test/validate/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (

func TestSuite(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Validate Catalog Test Suite")
RunSpecs(t, "OLM-Catalog-Validation")
}

var _ = Describe("Check Catalog Consistency", func() {
var _ = Describe("OLM-Catalog-Validation", func() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be "OLMv1"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TRT wants the name of the component: https://redhat-internal.slack.com/archives/C01CQA76KMX/p1749049667418439?thread_ts=1748434430.004709&cid=C01CQA76KMX

They want the name to match the component.
If we add other name it might take other circle back
Not valuable.

Furthermore, the images are used in both versions v1 and v0 so far.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

catalogsPath := "../../../catalogd/kustomize/overlays/openshift/catalogs"
images, err := utils.ParseImageRefsFromCatalog(catalogsPath)
Expect(err).ToNot(HaveOccurred())
Expand Down