Skip to content

K
k3s
Unverified Commit 02387f1a authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #75344 from jeffdyoung/multi-arch-tests

enable s390x to test containers
parents 9feb23e5 468d0a2d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
test/images/dnsutils/BASEIMAGE
View file @ 02387f1a
...@@ -2,3 +2,4 @@ amd64=alpine:3.6 ...@@ -2,3 +2,4 @@ amd64=alpine:3.6
arm=arm32v6/alpine:3.6 arm=arm32v6/alpine:3.6
arm64=arm64v8/alpine:3.6 arm64=arm64v8/alpine:3.6
ppc64le=ppc64le/alpine:3.6 ppc64le=ppc64le/alpine:3.6
s390x=s390x/alpine:3.6
test/images/echoserver/BASEIMAGE
View file @ 02387f1a
...@@ -2,3 +2,4 @@ amd64=nginx:1.15-alpine ...@@ -2,3 +2,4 @@ amd64=nginx:1.15-alpine
arm=arm32v6/nginx:1.15-alpine arm=arm32v6/nginx:1.15-alpine
arm64=arm64v8/nginx:1.15-alpine arm64=arm64v8/nginx:1.15-alpine
ppc64le=ppc64le/nginx:1.15-alpine ppc64le=ppc64le/nginx:1.15-alpine
s390x=s390x/nginx:1.15-alpine
test/images/hostexec/BASEIMAGE
View file @ 02387f1a
...@@ -2,3 +2,4 @@ amd64=alpine:3.6 ...@@ -2,3 +2,4 @@ amd64=alpine:3.6
arm=arm32v6/alpine:3.6 arm=arm32v6/alpine:3.6
arm64=arm64v8/alpine:3.6 arm64=arm64v8/alpine:3.6
ppc64le=ppc64le/alpine:3.6 ppc64le=ppc64le/alpine:3.6
s390x=s390x/alpine:3.6
test/images/jessie-dnsutils/BASEIMAGE
View file @ 02387f1a
...@@ -2,3 +2,4 @@ amd64=debian:jessie ...@@ -2,3 +2,4 @@ amd64=debian:jessie
arm=arm32v7/debian:jessie arm=arm32v7/debian:jessie
arm64=arm64v8/debian:jessie arm64=arm64v8/debian:jessie
ppc64le=ppc64le/debian:jessie ppc64le=ppc64le/debian:jessie
s390x=s390x/debian:jessie
test/images/jessie-dnsutils/fixup-apt-list.sh
View file @ 02387f1a
...@@ -21,7 +21,7 @@ DEB_ARCH=$(dpkg --print-architecture) ...@@ -21,7 +21,7 @@ DEB_ARCH=$(dpkg --print-architecture)
# /etc/apt/sources.list which is "deb http://deb.debian.org/debian jessie-updates main" # /etc/apt/sources.list which is "deb http://deb.debian.org/debian jessie-updates main"
case ${DEB_ARCH} in case ${DEB_ARCH} in
arm64|ppc64el) s390x|arm64|ppc64el)
sed -i '/debian-security/d' /etc/apt/sources.list sed -i '/debian-security/d' /etc/apt/sources.list
;; ;;
esac esac
......
test/images/net/BASEIMAGE
View file @ 02387f1a
...@@ -2,3 +2,4 @@ amd64=alpine:3.6 ...@@ -2,3 +2,4 @@ amd64=alpine:3.6
arm=arm32v6/alpine:3.6 arm=arm32v6/alpine:3.6
arm64=arm64v8/alpine:3.6 arm64=arm64v8/alpine:3.6
ppc64le=ppc64le/alpine:3.6 ppc64le=ppc64le/alpine:3.6
s390x=s390x/alpine:3.6
test/images/redis/BASEIMAGE
View file @ 02387f1a
...@@ -2,3 +2,4 @@ amd64=alpine:3.6 ...@@ -2,3 +2,4 @@ amd64=alpine:3.6
arm=arm32v6/alpine:3.6 arm=arm32v6/alpine:3.6
arm64=arm64v8/alpine:3.6 arm64=arm64v8/alpine:3.6
ppc64le=ppc64le/alpine:3.6 ppc64le=ppc64le/alpine:3.6
s390x=s390x/alpine:3.6
test/images/resource-consumer/BASEIMAGE
View file @ 02387f1a
...@@ -2,3 +2,4 @@ amd64=k8s.gcr.io/debian-base-amd64:0.4.1 ...@@ -2,3 +2,4 @@ amd64=k8s.gcr.io/debian-base-amd64:0.4.1
arm=k8s.gcr.io/debian-base-arm:0.4.1 arm=k8s.gcr.io/debian-base-arm:0.4.1
arm64=k8s.gcr.io/debian-base-arm64:0.4.1 arm64=k8s.gcr.io/debian-base-arm64:0.4.1
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1
s390x=k8s.gcr.io/debian-base-s390x:0.4.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment