diff --git a/test/images/README.md b/test/images/README.md index 7b571e3d715..224eab98470 100644 --- a/test/images/README.md +++ b/test/images/README.md @@ -95,7 +95,7 @@ It can be used by anyone, but if you need to build your own, you can read more a For Windows, in order to spawn process-isolated containers, the container OS version should closely match the host OS version. For this reason, we build test images for different Windows OS Versions: 1809 (Windows Server 2019), -2004, 20H2, ltsc2022. In order add support for a new Windows OS version, a new entry for that OS version will have +20H2, ltsc2022. In order to add support for a new Windows OS version, a new entry for that OS version will have to be first added to the `windows-servercore-cache` and `busybox` images, followed by the rest of the images. These images are then used by the rest of the E2E test images as a cache / base image. diff --git a/test/images/agnhost/BASEIMAGE b/test/images/agnhost/BASEIMAGE index 8620733faab..e33c2d03c88 100644 --- a/test/images/agnhost/BASEIMAGE +++ b/test/images/agnhost/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/alpine:3.12 linux/ppc64le=ppc64le/alpine:3.12 linux/s390x=s390x/alpine:3.12 windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/agnhost/README.md b/test/images/agnhost/README.md index c6fd601b838..e32bff544b8 100644 --- a/test/images/agnhost/README.md +++ b/test/images/agnhost/README.md @@ -667,7 +667,6 @@ The Windows `agnhost` image includes a `nc` binary that is 100% compliant with i ## Image -The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.33` for both Linux and -Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, -`mcr.microsoft.com/windows/nanoserver:2004`, `mcr.microsoft.com/windows/nanoserver:20H2`, and +The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.35` for both Linux and +Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, `mcr.microsoft.com/windows/nanoserver:20H2`, and `mcr.microsoft.com/windows/nanoserver:ltsc2022`). diff --git a/test/images/busybox/BASEIMAGE b/test/images/busybox/BASEIMAGE index 9f6c229f27d..d83d76490fd 100644 --- a/test/images/busybox/BASEIMAGE +++ b/test/images/busybox/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/busybox:1.29 linux/ppc64le=ppc64le/busybox:1.29 linux/s390x=s390x/busybox:1.29 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 -windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/busybox/VERSION b/test/images/busybox/VERSION index efe83c6a8a4..c857497c5b8 100644 --- a/test/images/busybox/VERSION +++ b/test/images/busybox/VERSION @@ -1 +1 @@ -1.29-2 +1.29-3 diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE index 4fecf09e855..30938a40d25 100644 --- a/test/images/echoserver/BASEIMAGE +++ b/test/images/echoserver/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/nginx:1.15-alpine linux/ppc64le=ppc64le/nginx:1.15-alpine linux/s390x=s390x/nginx:1.15-alpine windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/httpd-new/BASEIMAGE b/test/images/httpd-new/BASEIMAGE index 0d24a22d5ad..cd8e94e689a 100644 --- a/test/images/httpd-new/BASEIMAGE +++ b/test/images/httpd-new/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/httpd:2.4.39-alpine linux/ppc64le=ppc64le/httpd:2.4.39-alpine linux/s390x=s390x/httpd:2.4.39-alpine windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/httpd-new/VERSION b/test/images/httpd-new/VERSION index c632dc548f5..513bcb43dd4 100644 --- a/test/images/httpd-new/VERSION +++ b/test/images/httpd-new/VERSION @@ -1 +1 @@ -2.4.39-2 +2.4.39-3 diff --git a/test/images/httpd/BASEIMAGE b/test/images/httpd/BASEIMAGE index d804834c552..116ac54e7fe 100644 --- a/test/images/httpd/BASEIMAGE +++ b/test/images/httpd/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/httpd:2.4.38-alpine linux/ppc64le=ppc64le/httpd:2.4.38-alpine linux/s390x=s390x/httpd:2.4.38-alpine windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/httpd/VERSION b/test/images/httpd/VERSION index e5a74aeaa12..a4118661e35 100644 --- a/test/images/httpd/VERSION +++ b/test/images/httpd/VERSION @@ -1 +1 @@ -2.4.38-2 +2.4.38-3 diff --git a/test/images/image-util.sh b/test/images/image-util.sh index f110fc31024..91d7c7b1b4b 100755 --- a/test/images/image-util.sh +++ b/test/images/image-util.sh @@ -39,7 +39,7 @@ declare -A QEMUARCHS=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["pp # NOTE(claudiub): In the test image build jobs, this script is not being run in a git repository, # which would cause git log to fail. Instead, we can use the GIT_COMMIT_ID set in cloudbuild.yaml. GIT_COMMIT_ID=$(git log -1 --format=%h || echo "${GIT_COMMIT_ID}") -windows_os_versions=(1809 2004 20H2 ltsc2022) +windows_os_versions=(1809 20H2 ltsc2022) declare -A WINDOWS_OS_VERSIONS_MAP initWindowsOsVersions() { diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE index bb3907c713d..fc3db23e9a6 100644 --- a/test/images/jessie-dnsutils/BASEIMAGE +++ b/test/images/jessie-dnsutils/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/debian:jessie linux/ppc64le=ppc64le/debian:jessie linux/s390x=s390x/debian:jessie windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/jessie-dnsutils/VERSION b/test/images/jessie-dnsutils/VERSION index c239c60cba2..810ee4e91e2 100644 --- a/test/images/jessie-dnsutils/VERSION +++ b/test/images/jessie-dnsutils/VERSION @@ -1 +1 @@ -1.5 +1.6 diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE index ce028534e48..ad89430e1a6 100644 --- a/test/images/kitten/BASEIMAGE +++ b/test/images/kitten/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=REGISTRY/agnhost:2.33-linux-arm64 linux/ppc64le=REGISTRY/agnhost:2.33-linux-ppc64le linux/s390x=REGISTRY/agnhost:2.33-linux-s390x windows/amd64/1809=REGISTRY/agnhost:2.33-windows-amd64-1809 -windows/amd64/2004=REGISTRY/agnhost:2.33-windows-amd64-2004 windows/amd64/20H2=REGISTRY/agnhost:2.33-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/agnhost:2.33-windows-amd64-ltsc2022 diff --git a/test/images/kitten/VERSION b/test/images/kitten/VERSION index c239c60cba2..810ee4e91e2 100644 --- a/test/images/kitten/VERSION +++ b/test/images/kitten/VERSION @@ -1 +1 @@ -1.5 +1.6 diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE index ce028534e48..ad89430e1a6 100644 --- a/test/images/nautilus/BASEIMAGE +++ b/test/images/nautilus/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=REGISTRY/agnhost:2.33-linux-arm64 linux/ppc64le=REGISTRY/agnhost:2.33-linux-ppc64le linux/s390x=REGISTRY/agnhost:2.33-linux-s390x windows/amd64/1809=REGISTRY/agnhost:2.33-windows-amd64-1809 -windows/amd64/2004=REGISTRY/agnhost:2.33-windows-amd64-2004 windows/amd64/20H2=REGISTRY/agnhost:2.33-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/agnhost:2.33-windows-amd64-ltsc2022 diff --git a/test/images/nautilus/VERSION b/test/images/nautilus/VERSION index c239c60cba2..810ee4e91e2 100644 --- a/test/images/nautilus/VERSION +++ b/test/images/nautilus/VERSION @@ -1 +1 @@ -1.5 +1.6 diff --git a/test/images/nginx-new/BASEIMAGE b/test/images/nginx-new/BASEIMAGE index 4fecf09e855..30938a40d25 100644 --- a/test/images/nginx-new/BASEIMAGE +++ b/test/images/nginx-new/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/nginx:1.15-alpine linux/ppc64le=ppc64le/nginx:1.15-alpine linux/s390x=s390x/nginx:1.15-alpine windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/nginx-new/VERSION b/test/images/nginx-new/VERSION index 0d64f39561d..d0e0cf80cd8 100644 --- a/test/images/nginx-new/VERSION +++ b/test/images/nginx-new/VERSION @@ -1 +1 @@ -1.15-2 +1.15-3 diff --git a/test/images/nginx/BASEIMAGE b/test/images/nginx/BASEIMAGE index 046b164e285..886bf79daa5 100644 --- a/test/images/nginx/BASEIMAGE +++ b/test/images/nginx/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/nginx:1.14-alpine linux/ppc64le=ppc64le/nginx:1.14-alpine linux/s390x=s390x/nginx:1.14-alpine windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/nginx/VERSION b/test/images/nginx/VERSION index ce93a212ed1..3990511cacc 100644 --- a/test/images/nginx/VERSION +++ b/test/images/nginx/VERSION @@ -1 +1 @@ -1.14-2 +1.14-3 diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index 811f9537950..5857e18a14a 100644 --- a/test/images/nonroot/BASEIMAGE +++ b/test/images/nonroot/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=k8s.gcr.io/debian-base-arm64:v1.0.0 linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:v1.0.0 linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 -windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/nonroot/VERSION b/test/images/nonroot/VERSION index 5625e59da88..7e32cd56983 100644 --- a/test/images/nonroot/VERSION +++ b/test/images/nonroot/VERSION @@ -1 +1 @@ -1.2 +1.3 diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE index 08a90525ea3..601049b2a3d 100644 --- a/test/images/redis/BASEIMAGE +++ b/test/images/redis/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/alpine:3.6 linux/ppc64le=ppc64le/alpine:3.6 linux/s390x=s390x/alpine:3.6 windows/amd64/1809=REGISTRY/busybox:1.29-2-windows-amd64-1809 -windows/amd64/2004=REGISTRY/busybox:1.29-2-windows-amd64-2004 windows/amd64/20H2=REGISTRY/busybox:1.29-2-windows-amd64-20H2 windows/amd64/ltsc2022=REGISTRY/busybox:1.29-2-windows-amd64-ltsc2022 diff --git a/test/images/redis/VERSION b/test/images/redis/VERSION index 46024f04a92..424d0f572cf 100644 --- a/test/images/redis/VERSION +++ b/test/images/redis/VERSION @@ -1 +1 @@ -5.0.5-1 +5.0.5-2 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index 2f16eb2be8d..d9428fdd8b5 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1 linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1 linux/s390x=k8s.gcr.io/debian-base-s390x:0.4.1 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 -windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION index c044b1a3269..09601587019 100644 --- a/test/images/resource-consumer/VERSION +++ b/test/images/resource-consumer/VERSION @@ -1 +1 @@ -1.10 +1.11 diff --git a/test/images/sample-apiserver/BASEIMAGE b/test/images/sample-apiserver/BASEIMAGE index 088e746e625..c5d0505c1e5 100644 --- a/test/images/sample-apiserver/BASEIMAGE +++ b/test/images/sample-apiserver/BASEIMAGE @@ -4,6 +4,5 @@ linux/arm64=arm64v8/alpine:3.8 linux/ppc64le=ppc64le/alpine:3.8 linux/s390x=s390x/alpine:3.8 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 -windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/sample-apiserver/VERSION b/test/images/sample-apiserver/VERSION index ff278344b33..622f042fdce 100644 --- a/test/images/sample-apiserver/VERSION +++ b/test/images/sample-apiserver/VERSION @@ -1 +1 @@ -1.17.5 +1.17.6 diff --git a/test/images/windows-nanoserver/BASEIMAGE b/test/images/windows-nanoserver/BASEIMAGE index c917035428e..0c29c65e0a0 100644 --- a/test/images/windows-nanoserver/BASEIMAGE +++ b/test/images/windows-nanoserver/BASEIMAGE @@ -1,4 +1,3 @@ windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 -windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/windows-nanoserver/VERSION b/test/images/windows-nanoserver/VERSION index 626799f0f85..8c1384d825d 100644 --- a/test/images/windows-nanoserver/VERSION +++ b/test/images/windows-nanoserver/VERSION @@ -1 +1 @@ -v1 +v2 diff --git a/test/images/windows-servercore-cache/BASEIMAGE b/test/images/windows-servercore-cache/BASEIMAGE index 8174e8d0cd3..db8b97a51f6 100644 --- a/test/images/windows-servercore-cache/BASEIMAGE +++ b/test/images/windows-servercore-cache/BASEIMAGE @@ -1,4 +1,3 @@ linux/amd64/1809=mcr.microsoft.com/windows/servercore:ltsc2019 -linux/amd64/2004=mcr.microsoft.com/windows/servercore:2004 linux/amd64/20H2=mcr.microsoft.com/windows/servercore:20H2 linux/amd64/ltsc2022=mcr.microsoft.com/windows/servercore:ltsc2022