Merge pull request #820 from andyzhangx/fix-win-test-failure

test: fix windows e2e test failure

Makefile

@@ -34,8 +34,8 @@ VERSION ?= latest
 # Use a custom version for E2E tests if we are testing in CI
 ifdef CI
 ifndef PUBLISH
-ifdef TEST_WINDOWS
-override IMAGE_VERSION := e2e-win-$(GIT_COMMIT)
+ifdef WINDOWS_SERVER_VERSION
+override IMAGE_VERSION := e2e-$(WINDOWS_SERVER_VERSION)-$(GIT_COMMIT)
 endif
 ifdef EXTERNAL_E2E_TEST
 override IMAGE_VERSION := e2e-external-$(GIT_COMMIT)
@@ -199,6 +199,7 @@ push-manifest:
 		done; \
 	done
 	docker manifest push --purge $(IMAGE_TAG)
+	docker manifest inspect $(IMAGE_TAG)
 ifdef PUBLISH
 	docker manifest create $(IMAGE_TAG_LATEST) $(foreach osarch, $(ALL_OS_ARCH), $(IMAGE_TAG)-${osarch})
 	set -x; \

cmd/smbplugin/Dockerfile.Windows

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 # these arguments come from BUILD_PLATFORMS used in release-tools
-ARG ADDON_IMAGE=servercore:1809@sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4
+ARG ADDON_IMAGE=servercore:1809
 ARG BASE_IMAGE=nanoserver:1809
 ARG REGISTRY=mcr.microsoft.com/windows
 
-FROM ${REGISTRY}/${ADDON_IMAGE} as addon
+FROM ${REGISTRY}/${ADDON_IMAGE} AS addon
 FROM ${REGISTRY}/${BASE_IMAGE}
 LABEL description="CSI SMB plugin"