Re: [PATCH] tests/tcg/s390x: Build tests with debian11

[Alex Bennée]

David Hildenbrand <david@redhat.com> writes:

> We need a newer compiler to build upcoming tests that test for z15
> features with -march=z15. So let's do it similar to arm64 and powerpc,
> using an environment based on debian11 to build tests only.
>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: "Alex Bennée" <alex.bennee@linaro.org>
> Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
> Cc: Wainer dos Santos Moschetta <wainersm@redhat.com>
> Cc: Beraldo Leal <bleal@redhat.com>
> Cc: David Miller <dmiller423@gmail.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>

Acked-by: Alex Bennée <alex.bennee@linaro.org>

for now... I'll update the s390x image on my next posting.

> ---
>  .gitlab-ci.d/container-cross.yml                    |  7 +++++++
>  tests/docker/Makefile.include                       |  3 ++-
>  .../dockerfiles/debian-s390x-test-cross.docker      | 13 +++++++++++++
>  tests/tcg/configure.sh                              |  2 +-
>  4 files changed, 23 insertions(+), 2 deletions(-)
>  create mode 100644 tests/docker/dockerfiles/debian-s390x-test-cross.docker
>
> diff --git a/.gitlab-ci.d/container-cross.yml 
> b/.gitlab-ci.d/container-cross.yml
> index a3b5b90552..f8544750ea 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -146,6 +146,13 @@ s390x-debian-cross-container:
>    variables:
>      NAME: debian-s390x-cross
>  
> +s390x-test-debian-cross-container:
> +  extends: .container_job_template
> +  stage: containers-layer2
> +  needs: ['amd64-debian11-container']
> +  variables:
> +    NAME: debian-s390x-test-cross
> +
>  sh4-debian-cross-container:
>    extends: .container_job_template
>    stage: containers-layer2
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index f1a0c5db7a..b77f6088d9 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -210,6 +210,7 @@ docker-image-debian-arm64-test-cross: 
> docker-image-debian11
>  docker-image-debian-microblaze-cross: docker-image-debian10
>  docker-image-debian-nios2-cross: docker-image-debian10
>  docker-image-debian-powerpc-test-cross: docker-image-debian11
> +docker-image-debian-s390x-test-cross: docker-image-debian11
>  
>  # These images may be good enough for building tests but not for test builds
>  DOCKER_PARTIAL_IMAGES += debian-alpha-cross
> @@ -219,7 +220,7 @@ DOCKER_PARTIAL_IMAGES += debian-hppa-cross
>  DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
>  DOCKER_PARTIAL_IMAGES += debian-microblaze-cross
>  DOCKER_PARTIAL_IMAGES += debian-nios2-cross
> -DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
> +DOCKER_PARTIAL_IMAGES += debian-s390x-test-cross debian-sh4-cross 
> debian-sparc64-cross
>  DOCKER_PARTIAL_IMAGES += debian-tricore-cross
>  DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
>  DOCKER_PARTIAL_IMAGES += fedora-cris-cross
> diff --git a/tests/docker/dockerfiles/debian-s390x-test-cross.docker 
> b/tests/docker/dockerfiles/debian-s390x-test-cross.docker
> new file mode 100644
> index 0000000000..26435287b6
> --- /dev/null
> +++ b/tests/docker/dockerfiles/debian-s390x-test-cross.docker
> @@ -0,0 +1,13 @@
> +#
> +# Docker s390x cross-compiler target (tests only)
> +#
> +# This docker target builds on the debian Bullseye base image.
> +#
> +FROM qemu/debian11
> +
> +# Add the foreign architecture we want and install dependencies
> +RUN dpkg --add-architecture s390x
> +RUN apt update && \
> +    DEBIAN_FRONTEND=noninteractive eatmydata \
> +        apt install -y --no-install-recommends \
> +        crossbuild-essential-s390x gcc-10-s390x-linux-gnu
> diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
> index 763e9b6ad8..3f00f9307f 100755
> --- a/tests/tcg/configure.sh
> +++ b/tests/tcg/configure.sh
> @@ -185,7 +185,7 @@ for target in $target_list; do
>        ;;
>      s390x-*)
>        container_hosts=x86_64
> -      container_image=debian-s390x-cross
> +      container_image=debian-s390x-test-cross
>        container_cross_cc=s390x-linux-gnu-gcc
>        ;;
>      sh4-*)


-- 
Alex Bennée