Skip to content

Commit

Permalink
fix: e2e robustness. (#1078)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlinsRan committed Jun 17, 2022
1 parent c48a62a commit 3214c69
Show file tree
Hide file tree
Showing 8 changed files with 234 additions and 283 deletions.
15 changes: 13 additions & 2 deletions Makefile
Expand Up @@ -38,7 +38,7 @@ VERSYM="github.com/apache/apisix-ingress-controller/pkg/version._buildVersion"
GITSHASYM="github.com/apache/apisix-ingress-controller/pkg/version._buildGitRevision"
BUILDOSSYM="github.com/apache/apisix-ingress-controller/pkg/version._buildOS"
GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM)=$(OSNAME)/$(OSARCH)"
E2E_CONCURRENCY ?= 1
E2E_CONCURRENCY ?= 2
E2E_SKIP_BUILD ?= 0

### build: Build apisix-ingress-controller
Expand Down Expand Up @@ -66,7 +66,7 @@ unit-test:

### e2e-test: Run e2e test cases (in existing clusters directly)
.PHONY: e2e-test
e2e-test: ginkgo-check push-images
e2e-test: ginkgo-check push-images e2e-wolf-rbac
kubectl apply -k $(PWD)/samples/deploy/crd
kubectl apply -f $(PWD)/samples/deploy/gateway-api
cd test/e2e \
Expand Down Expand Up @@ -218,3 +218,14 @@ update-all: update-codegen update-license update-mdlint update-gofmt
.PHONY: e2e-names-check
e2e-names-check:
chmod +x ./utils/check-e2e-names.sh && ./utils/check-e2e-names.sh

.PHONY: e2e-wolf-rbac
e2e-wolf-rbac:
ifeq ("$(E2E_FOCUS)", "")
chmod +x ./test/e2e/testdata/wolf-rbac/cmd.sh && ./test/e2e/testdata/wolf-rbac/cmd.sh start
endif
ifneq ("$(E2E_FOCUS)", "")
echo $(E2E_FOCUS) | grep -E 'suite-features|consumer|wolf' || exit 0 \
&& chmod +x ./test/e2e/testdata/wolf-rbac/cmd.sh \
&& ./test/e2e/testdata/wolf-rbac/cmd.sh start
endif
47 changes: 0 additions & 47 deletions test/e2e/scaffold/wolf-rbac.go

This file was deleted.

0 comments on commit 3214c69

Please sign in to comment.