Skip to content

fix(Makefile): Use only tool name to pass opm --container-tool #974

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
Sep 28, 2025
Merged

fix(Makefile): Use only tool name to pass opm --container-tool #974

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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,16 @@ e2e-tests-sequential-ginkgo: ginkgo ## Runs kuttl e2e sequential tests
.PHONY: e2e-tests-parallel-ginkgo ## Runs kuttl e2e parallel tests, (Defaults to 5 runs at a time)
e2e-tests-parallel-ginkgo: ginkgo
@echo "Running GitOps Operator parallel Ginkgo E2E tests..."
$(GINKGO_CLI) -p -v -procs=5 --trace --timeout 30m -r ./test/openshift/e2e/ginkgo/parallel
$(GINKGO_CLI) -p -v -procs=5 --trace --timeout 30m -r ./test/openshift/e2e/ginkgo/parallel

.PHONY: e2e-tests-sequential
e2e-tests-sequential:
e2e-tests-sequential:
CI=prow make e2e-tests-sequential-ginkgo ## Runs kuttl e2e sequentail tests
# @echo "Running GitOps Operator sequential E2E tests..."
# . ./scripts/run-kuttl-tests.sh sequential

.PHONY: e2e-tests-parallel ## Runs kuttl e2e parallel tests, (Defaults to 5 runs at a time)
e2e-tests-parallel:
e2e-tests-parallel:
CI=prow make e2e-tests-parallel-ginkgo
# @echo "Running GitOps Operator parallel E2E tests..."
# . ./scripts/run-kuttl-tests.sh parallel
Expand All @@ -196,12 +196,12 @@ e2e-non-olm-tests-sequential: ## Runs kuttl non-olm e2e sequentail tests
.PHONY: e2e-non-olm-tests-parallel ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time)
e2e-non-olm-tests-parallel:
@echo "Running Non-OLM GitOps Operator parallel E2E tests..."
. ./hack/scripts/run-non-olm-kuttl-test.sh -t parallel
. ./hack/scripts/run-non-olm-kuttl-test.sh -t parallel

.PHONY: e2e-non-olm-tests-all ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time)
e2e-non-olm-tests-all:
@echo "Running Non-OLM GitOps Operator E2E tests..."
. ./hack/scripts/run-non-olm-kuttl-test.sh -t all
. ./hack/scripts/run-non-olm-kuttl-test.sh -t all

##@ Build

Expand Down Expand Up @@ -354,7 +354,7 @@ endif
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
.PHONY: catalog-build
catalog-build: opm ## Build a catalog image.
$(OPM) index add --container-tool $(CONTAINER_RUNTIME) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
$(OPM) index add --container-tool $(shell basename $(CONTAINER_RUNTIME)) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)

# Push the catalog image.
.PHONY: catalog-push
Expand All @@ -364,7 +364,7 @@ catalog-push: ## Push a catalog image.

.PHONY: gosec
gosec: go_sec
$(GO_SEC) --exclude-dir "hack/upgrade-rollouts-manager" ./...
$(GO_SEC) --exclude-dir "hack/upgrade-rollouts-manager" ./...

.PHONY: lint
lint: golangci_lint
Expand Down