From 468d0a2daacc18734a2cfd2f389459b41d1b37e4 Mon Sep 17 00:00:00 2001 From: jeffdyoung Date: Mon, 18 Mar 2019 17:13:49 -0400 Subject: [PATCH] add s390x to test containers --- test/images/dnsutils/BASEIMAGE | 1 + test/images/echoserver/BASEIMAGE | 1 + test/images/hostexec/BASEIMAGE | 1 + test/images/jessie-dnsutils/BASEIMAGE | 1 + test/images/jessie-dnsutils/fixup-apt-list.sh | 2 +- test/images/net/BASEIMAGE | 1 + test/images/redis/BASEIMAGE | 1 + test/images/resource-consumer/BASEIMAGE | 1 + 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/images/dnsutils/BASEIMAGE b/test/images/dnsutils/BASEIMAGE index 114844f395..7bad7a6d3a 100644 --- a/test/images/dnsutils/BASEIMAGE +++ b/test/images/dnsutils/BASEIMAGE @@ -2,3 +2,4 @@ amd64=alpine:3.6 arm=arm32v6/alpine:3.6 arm64=arm64v8/alpine:3.6 ppc64le=ppc64le/alpine:3.6 +s390x=s390x/alpine:3.6 diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE index baff9efd08..d27954b62e 100644 --- a/test/images/echoserver/BASEIMAGE +++ b/test/images/echoserver/BASEIMAGE @@ -2,3 +2,4 @@ amd64=nginx:1.15-alpine arm=arm32v6/nginx:1.15-alpine arm64=arm64v8/nginx:1.15-alpine ppc64le=ppc64le/nginx:1.15-alpine +s390x=s390x/nginx:1.15-alpine diff --git a/test/images/hostexec/BASEIMAGE b/test/images/hostexec/BASEIMAGE index 114844f395..7bad7a6d3a 100644 --- a/test/images/hostexec/BASEIMAGE +++ b/test/images/hostexec/BASEIMAGE @@ -2,3 +2,4 @@ amd64=alpine:3.6 arm=arm32v6/alpine:3.6 arm64=arm64v8/alpine:3.6 ppc64le=ppc64le/alpine:3.6 +s390x=s390x/alpine:3.6 diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE index 8e90985b94..d792d1e77c 100644 --- a/test/images/jessie-dnsutils/BASEIMAGE +++ b/test/images/jessie-dnsutils/BASEIMAGE @@ -2,3 +2,4 @@ amd64=debian:jessie arm=arm32v7/debian:jessie arm64=arm64v8/debian:jessie ppc64le=ppc64le/debian:jessie +s390x=s390x/debian:jessie diff --git a/test/images/jessie-dnsutils/fixup-apt-list.sh b/test/images/jessie-dnsutils/fixup-apt-list.sh index 1cb1605634..f0c4988579 100755 --- a/test/images/jessie-dnsutils/fixup-apt-list.sh +++ b/test/images/jessie-dnsutils/fixup-apt-list.sh @@ -21,7 +21,7 @@ DEB_ARCH=$(dpkg --print-architecture) # /etc/apt/sources.list which is "deb http://deb.debian.org/debian jessie-updates main" case ${DEB_ARCH} in - arm64|ppc64el) + s390x|arm64|ppc64el) sed -i '/debian-security/d' /etc/apt/sources.list ;; esac diff --git a/test/images/net/BASEIMAGE b/test/images/net/BASEIMAGE index 114844f395..7bad7a6d3a 100644 --- a/test/images/net/BASEIMAGE +++ b/test/images/net/BASEIMAGE @@ -2,3 +2,4 @@ amd64=alpine:3.6 arm=arm32v6/alpine:3.6 arm64=arm64v8/alpine:3.6 ppc64le=ppc64le/alpine:3.6 +s390x=s390x/alpine:3.6 diff --git a/test/images/redis/BASEIMAGE b/test/images/redis/BASEIMAGE index 114844f395..7bad7a6d3a 100644 --- a/test/images/redis/BASEIMAGE +++ b/test/images/redis/BASEIMAGE @@ -2,3 +2,4 @@ amd64=alpine:3.6 arm=arm32v6/alpine:3.6 arm64=arm64v8/alpine:3.6 ppc64le=ppc64le/alpine:3.6 +s390x=s390x/alpine:3.6 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index 108ff91401..0b3af87d05 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -2,3 +2,4 @@ amd64=k8s.gcr.io/debian-base-amd64:0.4.1 arm=k8s.gcr.io/debian-base-arm:0.4.1 arm64=k8s.gcr.io/debian-base-arm64:0.4.1 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1 +s390x=k8s.gcr.io/debian-base-s390x:0.4.1