Skip to content

Commit a9cce55

Browse files
committed
test dalec image v1.33.3
test with v1.33.3-4 fix windows test failure fix v1.32.10 v1.33.4 1.32.10-2 1.33.4-2 v1.32.11 v1.33.5 test v1.33.7 v1.34.0 v1.33.8
1 parent 3ae7bdc commit a9cce55

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,19 +14,22 @@
1414

1515
PKG = sigs.k8s.io/azuredisk-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 ?= azuredisk-csi
2020
PLUGIN_NAME = azurediskplugin
21-
IMAGE_VERSION ?= v1.34.0
21+
IMAGE_VERSION = v1.33.8
2222
CHART_VERSION ?= latest
2323
CLOUD ?= AzurePublicCloud
2424
# Use a custom version for E2E tests if we are testing in CI
2525
ifdef CI
2626
ifndef PUBLISH
27-
override IMAGE_VERSION := $(IMAGE_VERSION)-$(GIT_COMMIT)
27+
override IMAGE_VERSION := $(IMAGE_VERSION)
2828
endif
2929
endif
30+
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
31+
override IMAGE_VERSION = v1.33.8
32+
endif
3033
CSI_IMAGE_TAG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
3134
CSI_IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest
3235
REV = $(shell git describe --long --tags --dirty)
@@ -98,11 +101,6 @@ sanity-test: azuredisk
98101

99102
.PHONY: e2e-bootstrap
100103
e2e-bootstrap: install-helm
101-
ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
102-
(docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest
103-
else
104-
docker pull $(CSI_IMAGE_TAG) || make container-all push-manifest
105-
endif
106104
ifdef TEST_WINDOWS
107105
helm install azuredisk-csi-driver charts/${CHART_VERSION}/azuredisk-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
108106
${E2E_HELM_OPTIONS} \

0 commit comments

Comments
 (0)