Skip to content

🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller #1780

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
Feb 17, 2025
Merged

🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller #1780

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
20 changes: 0 additions & 20 deletions .github/workflows/catalogd-e2e.yaml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ CATALOGD_KUSTOMIZE_BUILD_DIR := catalogd/config/overlays/cert-manager

.DEFAULT_GOAL := build

GINKGO := go run github.com/onsi/ginkgo/v2/ginkgo

#SECTION General

# The help target prints out all targets with their descriptions organized
Expand Down Expand Up @@ -226,26 +224,6 @@ test-e2e: GO_BUILD_FLAGS := -cover
test-e2e: CATALOGD_KUSTOMIZE_BUILD_DIR := catalogd/config/overlays/e2e
test-e2e: run image-registry e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster


## image-registry target has to come after run-latest-release,
## because the image-registry depends on the olm-ca issuer.
.PHONY: test-catalogd-upgrade-e2e
test-catalogd-upgrade-e2e: export TEST_CLUSTER_CATALOG_NAME := test-catalog
test-catalogd-upgrade-e2e: export TEST_CLUSTER_CATALOG_IMAGE := docker-registry.catalogd-e2e.svc:5000/test-catalog:e2e
test-catalogd-upgrade-e2e: ISSUER_KIND=ClusterIssuer
test-catalogd-upgrade-e2e: ISSUER_NAME=olmv1-ca
test-catalogd-upgrade-e2e: kind-cluster docker-build kind-load run-latest-release catalogd-image-registry catalogd-pre-upgrade-setup kind-deploy catalogd-post-upgrade-checks kind-clean ## Run upgrade e2e tests on a local kind cluster

.PHONY: catalogd-post-upgrade-checks
catalogd-post-upgrade-checks:
$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/catalogd-upgrade-e2e

catalogd-pre-upgrade-setup:
./test/tools/imageregistry/pre-upgrade-setup.sh ${TEST_CLUSTER_CATALOG_IMAGE} ${TEST_CLUSTER_CATALOG_NAME}

catalogd-image-registry: ## Setup in-cluster image registry
./test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)

.PHONY: extension-developer-e2e
extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e #EXHELP Run extension-developer e2e on local kind cluster
Expand Down
2 changes: 0 additions & 2 deletions catalogd/testdata/catalogs/test-catalog/.indexignore
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions catalogd/testdata/catalogs/test-catalog/catalog.yaml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions catalogd/testdata/catalogs/test-catalog/expected_all.json
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ require (
github.com/google/go-containerregistry v0.20.3
github.com/gorilla/handlers v1.5.2
github.com/klauspost/compress v1.17.11
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
Comment on lines -18 to -19
Copy link
Contributor

Choose a reason for hiding this comment

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

Woohoo!

github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0
github.com/operator-framework/api v0.29.0
Expand Down Expand Up @@ -116,7 +114,6 @@ require (
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/validate v0.24.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand All @@ -125,7 +122,6 @@ require (
github.com/google/cel-go v0.22.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
Expand Down Expand Up @@ -178,6 +174,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/onsi/gomega v1.36.2 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 // indirect
github.com/operator-framework/operator-lib v0.17.0 // indirect
Expand Down
142 changes: 0 additions & 142 deletions test/catalogd-upgrade-e2e/unpack_test.go
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions test/catalogd-upgrade-e2e/upgrade_suite_test.go
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions test/tools/imageregistry/imagebuilder.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading