From 72919fbd6693a18ca59231dd886152fd3f5ef8df Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Mon, 6 Apr 2026 01:28:40 +0000 Subject: [PATCH] integration/images: add s390x builds for volume test images Ensure volume-copy-up and volume-ownership publish linux/s390x variants so integration tests can use these images on s390x without architecture-specific skips. Signed-off-by: Jintao Zhang --- integration/images/volume-copy-up/Makefile | 5 +++-- integration/images/volume-ownership/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/integration/images/volume-copy-up/Makefile b/integration/images/volume-copy-up/Makefile index 99d8680853e19..8524f9b72a75e 100644 --- a/integration/images/volume-copy-up/Makefile +++ b/integration/images/volume-copy-up/Makefile @@ -31,7 +31,7 @@ endif # Operating systems supported: linux, windows OS ?= linux -# Architectures supported: amd64, arm64 +# Architectures supported: amd64, arm64, ppc64le, s390x ARCH ?= amd64 # OS Version for the Windows images: 1809, 20H2, ltsc2022 OSVERSION ?= 1809 @@ -41,7 +41,7 @@ OSVERSION ?= 1809 OUTPUT_TYPE ?= docker ALL_OS = linux -ALL_ARCH.linux = amd64 arm64 ppc64le +ALL_ARCH.linux = amd64 arm64 ppc64le s390x ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) ifneq ($(REMOTE_DOCKER_URL),) @@ -54,6 +54,7 @@ endif BASE.linux.amd64 := busybox BASE.linux.arm64 := arm64v8/busybox BASE.linux.ppc64le := busybox +BASE.linux.s390x := busybox BASE.linux := ${BASE.linux.${ARCH}} BASE := ${BASE.${OS}} diff --git a/integration/images/volume-ownership/Makefile b/integration/images/volume-ownership/Makefile index 67ab919e082f9..bb87362e977df 100644 --- a/integration/images/volume-ownership/Makefile +++ b/integration/images/volume-ownership/Makefile @@ -31,7 +31,7 @@ endif # Operating systems supported: linux, windows OS ?= linux -# Architectures supported: amd64, arm64 +# Architectures supported: amd64, arm64, ppc64le, s390x ARCH ?= amd64 # OS Version for the Windows images: 1809, 20H2, ltsc2022 OSVERSION ?= 1809 @@ -41,7 +41,7 @@ OSVERSION ?= 1809 OUTPUT_TYPE ?= docker ALL_OS = linux -ALL_ARCH.linux = amd64 arm64 ppc64le +ALL_ARCH.linux = amd64 arm64 ppc64le s390x ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) ifneq ($(REMOTE_DOCKER_URL),) @@ -54,6 +54,7 @@ endif BASE.linux.amd64 := busybox BASE.linux.arm64 := arm64v8/busybox BASE.linux.ppc64le := busybox +BASE.linux.s390x := busybox BASE.linux := ${BASE.linux.${ARCH}} BASE := ${BASE.${OS}}