From e2ca45ca0a28fe8b31d8baa43ccc955e13ce51ec Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Thu, 18 Jun 2020 15:57:54 +0000 Subject: [PATCH 1/2] test images: Adds windows/amd64/2004 BASEIMAGE --- test/images/agnhost/BASEIMAGE | 1 + test/images/busybox/BASEIMAGE | 1 + test/images/echoserver/BASEIMAGE | 1 + test/images/jessie-dnsutils/BASEIMAGE | 1 + test/images/kitten/BASEIMAGE | 17 +++++++++-------- test/images/nautilus/BASEIMAGE | 17 +++++++++-------- test/images/nonroot/BASEIMAGE | 1 + test/images/redis/BASEIMAGE | 1 + test/images/sample-apiserver/BASEIMAGE | 1 + 9 files changed, 25 insertions(+), 16 deletions(-) diff --git a/test/images/agnhost/BASEIMAGE b/test/images/agnhost/BASEIMAGE index cc7c45a7657..1abb3804784 100644 --- a/test/images/agnhost/BASEIMAGE +++ b/test/images/agnhost/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=s390x/alpine:3.6 windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 diff --git a/test/images/busybox/BASEIMAGE b/test/images/busybox/BASEIMAGE index 25a8a313cad..87d9d142309 100644 --- a/test/images/busybox/BASEIMAGE +++ b/test/images/busybox/BASEIMAGE @@ -1,3 +1,4 @@ windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909 +windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE index 82c59fd2470..8e3021fc673 100644 --- a/test/images/echoserver/BASEIMAGE +++ b/test/images/echoserver/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=s390x/nginx:1.15-alpine windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE index 704e84e512b..39d69011c61 100644 --- a/test/images/jessie-dnsutils/BASEIMAGE +++ b/test/images/jessie-dnsutils/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=s390x/debian:jessie windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE index 9d00181552a..bcb87adefb4 100644 --- a/test/images/kitten/BASEIMAGE +++ b/test/images/kitten/BASEIMAGE @@ -1,8 +1,9 @@ -linux/amd64=REGISTRY/agnhost:2.21-linux-amd64 -linux/arm=REGISTRY/agnhost:2.21-linux-arm -linux/arm64=REGISTRY/agnhost:2.21-linux-arm64 -linux/ppc64le=REGISTRY/agnhost:2.21-linux-ppc64le -linux/s390x=REGISTRY/agnhost:2.21-linux-s390x -windows/amd64/1809=REGISTRY/agnhost:2.21-windows-amd64-1809 -windows/amd64/1903=REGISTRY/agnhost:2.21-windows-amd64-1903 -windows/amd64/1909=REGISTRY/agnhost:2.21-windows-amd64-1909 +linux/amd64=REGISTRY/agnhost:2.25-linux-amd64 +linux/arm=REGISTRY/agnhost:2.25-linux-arm +linux/arm64=REGISTRY/agnhost:2.25-linux-arm64 +linux/ppc64le=REGISTRY/agnhost:2.25-linux-ppc64le +linux/s390x=REGISTRY/agnhost:2.25-linux-s390x +windows/amd64/1809=REGISTRY/agnhost:2.25-windows-amd64-1809 +windows/amd64/1903=REGISTRY/agnhost:2.25-windows-amd64-1903 +windows/amd64/1909=REGISTRY/agnhost:2.25-windows-amd64-1909 +windows/amd64/2004=REGISTRY/agnhost:2.25-windows-amd64-2004 diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE index 9d00181552a..bcb87adefb4 100644 --- a/test/images/nautilus/BASEIMAGE +++ b/test/images/nautilus/BASEIMAGE @@ -1,8 +1,9 @@ -linux/amd64=REGISTRY/agnhost:2.21-linux-amd64 -linux/arm=REGISTRY/agnhost:2.21-linux-arm -linux/arm64=REGISTRY/agnhost:2.21-linux-arm64 -linux/ppc64le=REGISTRY/agnhost:2.21-linux-ppc64le -linux/s390x=REGISTRY/agnhost:2.21-linux-s390x -windows/amd64/1809=REGISTRY/agnhost:2.21-windows-amd64-1809 -windows/amd64/1903=REGISTRY/agnhost:2.21-windows-amd64-1903 -windows/amd64/1909=REGISTRY/agnhost:2.21-windows-amd64-1909 +linux/amd64=REGISTRY/agnhost:2.25-linux-amd64 +linux/arm=REGISTRY/agnhost:2.25-linux-arm +linux/arm64=REGISTRY/agnhost:2.25-linux-arm64 +linux/ppc64le=REGISTRY/agnhost:2.25-linux-ppc64le +linux/s390x=REGISTRY/agnhost:2.25-linux-s390x +windows/amd64/1809=REGISTRY/agnhost:2.25-windows-amd64-1809 +windows/amd64/1903=REGISTRY/agnhost:2.25-windows-amd64-1903 +windows/amd64/1909=REGISTRY/agnhost:2.25-windows-amd64-1909 +windows/amd64/2004=REGISTRY/agnhost:2.25-windows-amd64-2004 diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index d21f5f08ac3..3c5a77983f0 100644 --- a/test/images/nonroot/BASEIMAGE +++ b/test/images/nonroot/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909 +windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE index cc7c45a7657..1abb3804784 100644 --- a/test/images/redis/BASEIMAGE +++ b/test/images/redis/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=s390x/alpine:3.6 windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 diff --git a/test/images/sample-apiserver/BASEIMAGE b/test/images/sample-apiserver/BASEIMAGE index 08ae26e3512..1cd8a3316e8 100644 --- a/test/images/sample-apiserver/BASEIMAGE +++ b/test/images/sample-apiserver/BASEIMAGE @@ -6,3 +6,4 @@ linux/s390x=s390x/alpine:3.8 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909 +windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 From f78aa177faebfd13377eb36be679fd834c6bc5e1 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Mon, 14 Dec 2020 16:31:50 +0000 Subject: [PATCH 2/2] test images: Adds windows/amd64/20H2 BASEIMAGE --- test/images/agnhost/BASEIMAGE | 1 + test/images/busybox/BASEIMAGE | 1 + test/images/echoserver/BASEIMAGE | 1 + test/images/jessie-dnsutils/BASEIMAGE | 1 + test/images/kitten/BASEIMAGE | 1 + test/images/nautilus/BASEIMAGE | 1 + test/images/nonroot/BASEIMAGE | 1 + test/images/redis/BASEIMAGE | 1 + test/images/sample-apiserver/BASEIMAGE | 1 + 9 files changed, 9 insertions(+) diff --git a/test/images/agnhost/BASEIMAGE b/test/images/agnhost/BASEIMAGE index 1abb3804784..a25926321d4 100644 --- a/test/images/agnhost/BASEIMAGE +++ b/test/images/agnhost/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/busybox/BASEIMAGE b/test/images/busybox/BASEIMAGE index 87d9d142309..da963894f29 100644 --- a/test/images/busybox/BASEIMAGE +++ b/test/images/busybox/BASEIMAGE @@ -2,3 +2,4 @@ windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 +windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE index 8e3021fc673..3bb6ecf67ed 100644 --- a/test/images/echoserver/BASEIMAGE +++ b/test/images/echoserver/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE index 39d69011c61..e02eed16198 100644 --- a/test/images/jessie-dnsutils/BASEIMAGE +++ b/test/images/jessie-dnsutils/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE index bcb87adefb4..a58e2d8b731 100644 --- a/test/images/kitten/BASEIMAGE +++ b/test/images/kitten/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=REGISTRY/agnhost:2.25-windows-amd64-1809 windows/amd64/1903=REGISTRY/agnhost:2.25-windows-amd64-1903 windows/amd64/1909=REGISTRY/agnhost:2.25-windows-amd64-1909 windows/amd64/2004=REGISTRY/agnhost:2.25-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/agnhost:2.25-windows-amd64-20H2 diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE index bcb87adefb4..a58e2d8b731 100644 --- a/test/images/nautilus/BASEIMAGE +++ b/test/images/nautilus/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=REGISTRY/agnhost:2.25-windows-amd64-1809 windows/amd64/1903=REGISTRY/agnhost:2.25-windows-amd64-1903 windows/amd64/1909=REGISTRY/agnhost:2.25-windows-amd64-1909 windows/amd64/2004=REGISTRY/agnhost:2.25-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/agnhost:2.25-windows-amd64-20H2 diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index 3c5a77983f0..ccdf44438fd 100644 --- a/test/images/nonroot/BASEIMAGE +++ b/test/images/nonroot/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 +windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE index 1abb3804784..a25926321d4 100644 --- a/test/images/redis/BASEIMAGE +++ b/test/images/redis/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/sample-apiserver/BASEIMAGE b/test/images/sample-apiserver/BASEIMAGE index 1cd8a3316e8..639a48465ff 100644 --- a/test/images/sample-apiserver/BASEIMAGE +++ b/test/images/sample-apiserver/BASEIMAGE @@ -7,3 +7,4 @@ windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909 windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004 +windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2