Skip to content

Commit d96124b

Browse files
Merge pull request #167 from wongni/fix-kustomize-not-found-in-path-for-e2e
export hack/tools/bin folder to PATH
2 parents 03a9ef6 + 5a48184 commit d96124b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ endif
7777
export ACK_GINKGO_DEPRECATIONS := 1.16.5
7878
export ACK_GINKGO_RC=true
7979

80-
export PATH := $(TOOLS_BIN_DIR):$(PATH)
80+
export PATH := $(REPO_ROOT)/$(TOOLS_BIN_DIR):$(PATH)
8181

8282
all: build
8383

@@ -264,12 +264,12 @@ e2e-cluster-templates: $(CLUSTER_TEMPLATES_OUTPUT_FILES) ## Generate cluster tem
264264
cluster-template%yaml: $(KUSTOMIZE) $(CLUSTER_TEMPLATES_INPUT_FILES)
265265
$(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone $(basename $@) > $@
266266

267-
e2e-essentials: $(GINKGO_V1) e2e-cluster-templates kind-cluster ## Fulfill essential tasks for e2e testing.
267+
e2e-essentials: $(GINKGO_V1) $(KUBECTL) e2e-cluster-templates kind-cluster ## Fulfill essential tasks for e2e testing.
268268
IMG=$(IMG_LOCAL) make generate-manifests docker-build docker-push
269269

270270
JOB ?= .*
271271
run-e2e: e2e-essentials ## Run e2e testing. JOB is an optional REGEXP to select certainn test cases to run. e.g. JOB=PR-Blocking, JOB=Conformance
272-
kubectl apply -f cloud-config.yaml && \
272+
$(KUBECTL) apply -f cloud-config.yaml && \
273273
cd test/e2e && \
274274
$(REPO_ROOT)/$(GINKGO_V1) -v -trace -tags=e2e -focus=$(JOB) -skip=Conformance -nodes=1 -noColor=false ./... -- \
275275
-e2e.artifacts-folder=${REPO_ROOT}/_artifacts \

0 commit comments

Comments
 (0)