@@ -373,8 +373,9 @@ function deliver_antrea_windows {
373373 sleep 5
374374 # Some tests need us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.13 image but it is not for windows/amd64 10.0.17763
375375 # Use e2eteam/agnhost:2.13 instead
376- harbor_images=(" sigwindowstools-kube-proxy:v1.18.0" " agnhost:2.13" " agnhost:2.13" " agnhost:2.29" " e2eteam-jessie-dnsutils:1.0" " e2eteam-pause:3.2" )
377- antrea_images=(" sigwindowstools/kube-proxy:v1.18.0" " e2eteam/agnhost:2.13" " us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.13" " k8s.gcr.io/e2e-test-images/agnhost:2.29" " e2eteam/jessie-dnsutils:1.0" " e2eteam/pause:3.2" )
376+ harbor_images=(" sigwindowstools-kube-proxy:v1.18.0" " agnhost:2.13" " agnhost:2.13" " agnhost:2.13" " agnhost:2.29" " e2eteam-jessie-dnsutils:1.0" " e2eteam-jessie-dnsutils:1.0" " e2eteam-pause:3.2" " e2eteam-pause:3.2" " e2eteam-busybox:1.29-windows-amd64-1809" )
377+ antrea_images=(" sigwindowstools/kube-proxy:v1.18.0" " e2eteam/agnhost:2.13" " us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.13" " k8sprow.azurecr.io/kubernetes-e2e-test-images/agnhost:2.13" " k8s.gcr.io/e2e-test-images/agnhost:2.29" " e2eteam/jessie-dnsutils:1.0" " gcr.io/kubernetes-e2e-test-images/jessie-dnsutils:1.0" " e2eteam/pause:3.2" " k8s.gcr.io/pause:3.2" " docker.io/library/busybox:1.29" )
378+ common_images=(" mcr.microsoft.com/windows/servercore/iis:latest" )
378379 # Pull necessary images in advance to avoid transient error
379380 for i in " ${! harbor_images[@]} " ; do
380381 ssh -o StrictHostKeyChecking=no -n Administrator@${IP} " docker pull -q ${DOCKER_REGISTRY} /antrea/${harbor_images[i]} && docker tag ${DOCKER_REGISTRY} /antrea/${harbor_images[i]} ${antrea_images[i]} " || true
@@ -410,7 +411,7 @@ function deliver_antrea_windows {
410411 done
411412 echo " === Build Windows on Windows Node==="
412413 ssh -o StrictHostKeyChecking=no -n Administrator@${IP} " docker pull ${DOCKER_REGISTRY} /antrea/golang:${GO_VERSION} -nanoserver && docker tag ${DOCKER_REGISTRY} /antrea/golang:${GO_VERSION} -nanoserver golang:${GO_VERSION} -nanoserver"
413- ssh -o StrictHostKeyChecking=no -n Administrator@${IP} " rm -rf antrea && mkdir antrea && cd antrea && tar -xzf ../antrea_repo.tar.gz > /dev/null && sed -i \" s|build/images/base-windows/Dockerfile|build/images/base-windows/Dockerfile --network host|g \" Makefile && sed -i \" s|build/images/Dockerfile.build.windows|build/images/Dockerfile.build.windows --network host|g \" Makefile && NO_PULL=${NO_PULL} make build-windows && docker save -o antrea-windows.tar ${DOCKER_REGISTRY} / antrea/antrea-windows:latest && gzip -f antrea-windows.tar" || true
414+ ssh -o StrictHostKeyChecking=no -n Administrator@${IP} " rm -rf antrea && mkdir antrea && cd antrea && tar -xzf ../antrea_repo.tar.gz > /dev/null && NO_PULL=${NO_PULL} ; DOCKER_NETWORK=host make build-windows && docker save -o antrea-windows.tar antrea/antrea-windows:latest && gzip -f antrea-windows.tar" || true
414415 for i in ` seq 2` ; do
415416 timeout 2m scp -o StrictHostKeyChecking=no -T Administrator@${IP} :antrea/antrea-windows.tar.gz . && break
416417 done
0 commit comments