Skip to content

Commit b3a95aa

Browse files
committed
fix: r
Signed-off-by: ashing <[email protected]>
1 parent 2f16c8c commit b3a95aa

File tree

3 files changed

+229
-15
lines changed

3 files changed

+229
-15
lines changed

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ GATEAY_API_VERSION ?= v1.2.0
1414

1515
DASHBOARD_VERSION ?= dev
1616
TEST_TIMEOUT ?= 45m
17-
CHART_DIR ?= $(shell pwd)/charts
18-
API7EE3_CHART_DIR ?= $(CHART_DIR)/api7ee3
1917

2018
export KUBECONFIG = /tmp/$(KIND_NAME).kubeconfig
2119

@@ -106,16 +104,14 @@ kind-e2e-test: kind-up build-image kind-load-images e2e-test
106104
.PHONY: e2e-test
107105
e2e-test:
108106
@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
109-
DASHBOARD_VERSION=$(DASHBOARD_VERSION) API7EE3_CHART_DIR=$(API7EE3_CHART_DIR) go test ./test/e2e/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
107+
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test ./test/e2e/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
110108

111109
.PHONY: download-api7ee3-chart
112110
download-api7ee3-chart:
113-
@mkdir -p $(CHART_DIR)
114-
@rm -rf $(API7EE3_CHART_DIR) || true
115111
@helm repo add api7 https://charts.api7.ai || true
116112
@helm repo update
117-
@helm pull api7/api7ee3 --untar --untardir $(CHART_DIR)
118-
@echo "Downloaded API7EE3 chart to $(API7EE3_CHART_DIR)"
113+
@helm pull api7/api7ee3 --destination "$(shell helm env HELM_REPOSITORY_CACHE)"
114+
@echo "Downloaded API7EE3 chart"
119115

120116
.PHONY: conformance-test
121117
conformance-test:

0 commit comments

Comments
 (0)