Skip to content

Commit 098cb24

Browse files
committed
test dalec image v1.33.6
1 parent 532e6ca commit 098cb24

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@
1414

1515
PKG = sigs.k8s.io/azurefile-csi-driver
1616
GIT_COMMIT ?= $(shell git rev-parse HEAD)
17-
REGISTRY ?= andyzhangx
17+
REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi
1818
REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
1919
IMAGE_NAME ?= azurefile-csi
2020
IMAGE_VERSION ?= v1.33.6
2121
# Use a custom version for E2E tests if we are testing in CI
2222
ifdef CI
2323
ifndef PUBLISH
24-
override IMAGE_VERSION := e2e-$(GIT_COMMIT)
24+
override IMAGE_VERSION := $(IMAGE_VERSION)
2525
endif
2626
endif
27+
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
28+
override IMAGE_VERSION = v1.33.6
29+
endif
2730
CSI_IMAGE_TAG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
2831
CSI_IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest
2932
BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
@@ -93,11 +96,6 @@ e2e-test:
9396

9497
.PHONY: e2e-bootstrap
9598
e2e-bootstrap: install-helm
96-
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
97-
(docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest
98-
else
99-
docker pull $(CSI_IMAGE_TAG) || make container-all push-manifest
100-
endif
10199
ifdef TEST_WINDOWS
102100
helm install azurefile-csi-driver charts/latest/azurefile-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
103101
${E2E_HELM_OPTIONS} \
@@ -244,4 +242,4 @@ endif
244242

245243
.PHONY: azurefile-proxy
246244
azurefile-proxy:
247-
CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -mod vendor -ldflags="-s -w" -o _output/${ARCH}/azurefile-proxy ./pkg/azurefile-proxy
245+
CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -mod vendor -ldflags="-s -w" -o _output/${ARCH}/azurefile-proxy ./pkg/azurefile-proxy

0 commit comments

Comments
 (0)