Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix ginkgo run
Browse files Browse the repository at this point in the history
yamatcha committed Jan 30, 2025
1 parent 5620656 commit b3d9772
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions e2e/Makefile
Original file line number Diff line number Diff line change
@@ -2,13 +2,11 @@ KIND_VERSION = 0.23.0
KUBERNETES_VERSION = 1.32.0
CERT_MANAGER_VERSION = 1.15.3
MYSQL_VERSION = 8.4.4
GINKGO_VERSION = 2.20.2

KIND := $(dir $(shell pwd))/bin/kind
KUBECTL := $(dir $(shell pwd))/bin/kubectl
KUSTOMIZE := $(dir $(shell pwd))/bin/kustomize
KUBECTL_MOCO := $(dir $(shell pwd))/bin/kubectl-moco
GINKGO := $(dir $(shell pwd))/bin/ginkgo
KUBECONFIG := $(shell pwd)/.kubeconfig
export MYSQL_VERSION KUBECTL KUBECONFIG

@@ -55,14 +53,14 @@ endif
$(KUBECTL) wait --timeout=90s --for=condition=Ready --all pods

.PHONY: test
test: $(GINKGO)
test:
env PATH="$$(pwd)/../bin:$$PATH" RUN_E2E=1 \
$(GINKGO) -v --procs 5 --fail-fast --randomize-all --timeout 90m .
go run github.com/onsi/ginkgo/v2/ginkgo run -v --procs 5 --fail-fast --randomize-all --timeout 90m .

.PHONY: test-upgrade
test-upgrade: $(GINKGO)
test-upgrade:
env PATH=$$(pwd)/../bin:$$PATH RUN_E2E=1 UPGRADE=1 \
$(GINKGO) -v --procs 5 --fail-fast --randomize-all --timeout 90m .
go run github.com/onsi/ginkgo/v2/ginkgo run -v --procs 5 --fail-fast --randomize-all --timeout 90m .

.PHONY: logs
logs:
@@ -95,6 +93,3 @@ $(KUBECTL_MOCO):
mkdir -p ../bin
cd ..; GOBIN=$$(pwd)/bin go install ./cmd/kubectl-moco

$(GINKGO):
mkdir -p ../bin
cd ..; GOBIN=$$(pwd)/bin go install github.com/onsi/ginkgo/v2/ginkgo@v$(GINKGO_VERSION)

0 comments on commit b3d9772

Please # to comment.