Skip to content

Commit e367618

Browse files
committed
do not export ARCH in e2e.mk
1 parent e6059b4 commit e367618

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

e2e.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@ test-e2e-run: generate-e2e-templates install-tools create-bootstrap ## Run e2e t
2626
test-e2e: ## Run "docker-build" and "docker-push" rules then run e2e tests.
2727
# $$ARCH is set to amd64 for aks cluster type
2828
if [ "$(MGMT_CLUSTER_TYPE)" = "aks" ]; then \
29-
export ARCH=amd64; \
29+
ARCH=amd64; \
3030
fi; \
31-
PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$$ARCH:$(TAG) \
31+
PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
3232
$(MAKE) docker-build docker-push \
3333
test-e2e-run
3434

3535
.PHONY: test-e2e-skip-push
3636
test-e2e-skip-push: ## Run "docker-build" rule then run e2e tests.
3737
if [ "$(MGMT_CLUSTER_TYPE)" = "aks" ]; then \
38-
export ARCH=amd64; \
38+
ARCH=amd64; \
3939
fi; \
40-
PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$$ARCH:$(TAG) \
40+
PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
4141
$(MAKE) docker-build \
4242
test-e2e-run
4343

4444
.PHONY: test-e2e-skip-build-and-push
4545
test-e2e-skip-build-and-push:
4646
if [ "$(MGMT_CLUSTER_TYPE)" = "aks" ]; then \
47-
export ARCH=amd64; \
47+
ARCH=amd64; \
4848
fi; \
49-
$(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLLER_IMG)-$$ARCH MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./config/capz/manager_image_patch.yaml" \
49+
$(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./config/capz/manager_image_patch.yaml" \
5050
$(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./config/capz/manager_pull_policy.yaml" PULL_POLICY=IfNotPresent \
51-
MANAGER_IMAGE=$(CONTROLLER_IMG)-$$ARCH:$(TAG) \
51+
MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
5252
$(MAKE) test-e2e-run

0 commit comments

Comments
 (0)