qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	richard.henderson@linaro.org, cota@braap.org,
	aurelien@aurel32.net
Subject: Re: [PATCH v3 25/30] tests/docker: add a linux-user testing focused image
Date: Mon, 29 Jun 2020 12:18:03 +0200	[thread overview]
Message-ID: <523f882a-2b1f-2d7c-d13e-b5d6b4f07aa2@redhat.com> (raw)
In-Reply-To: <20200626181357.26211-26-alex.bennee@linaro.org>

On 6/26/20 8:13 PM, Alex Bennée wrote:
> We happily use all the cross images for both cross-building QEMU as
> well as building the linux-user tests. However calling docker from
> within docker seems not to work. As we can build in Debian anyway why
> not include an image that has all the compilers available for
> non-docker invocation.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  .gitlab-ci.d/containers.yml                   |  7 +++
>  tests/docker/Makefile.include                 |  1 +
>  .../dockerfiles/debian-all-test-cross.docker  | 53 +++++++++++++++++++
>  3 files changed, 61 insertions(+)
>  create mode 100644 tests/docker/dockerfiles/debian-all-test-cross.docker
> 
> diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
> index ba9c24e98f1..20b2fb1de5d 100644
> --- a/.gitlab-ci.d/containers.yml
> +++ b/.gitlab-ci.d/containers.yml
> @@ -66,6 +66,13 @@ amd64-debian-cross-container:
>    variables:
>      NAME: debian-amd64-cross
>  
> +amd64-debian-user-cross-container:
> +  <<: *container_job_definition
> +  stage: containers-layer2
> +  needs: ['amd64-debian10-container']
> +  variables:
> +    NAME: debian-all-test-cross
> +
>  amd64-debian-container:
>    <<: *container_job_definition
>    stage: containers-layer2
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 8139e8467d4..079ceb6ff33 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -133,6 +133,7 @@ docker-image-travis: NOUSER=1
>  
>  # Specialist build images, sometimes very limited tools
>  docker-image-debian-tricore-cross: docker-image-debian9
> +docker-image-debian-all-test-cross: docker-image-debian10
>  docker-image-debian-arm64-test-cross: docker-image-debian11
>  
>  # These images may be good enough for building tests but not for test builds
> diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker
> new file mode 100644
> index 00000000000..dedcea58b46
> --- /dev/null
> +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker
> @@ -0,0 +1,53 @@
> +#
> +# Docker all cross-compiler target (tests only)
> +#
> +# While the normal cross builds take care to setup proper multiarch
> +# build environments which can cross build QEMU this just installs the
> +# basic compilers for as many targets as possible. We shall use this
> +# to build and run linux-user tests on GitLab
> +#
> +FROM qemu/debian10
> +
> +# What we need to build QEMU itself
> +RUN apt update && \
> +    DEBIAN_FRONTEND=noninteractive eatmydata \
> +    apt build-dep -yy qemu
> +
> +# Add the foreign architecture we want and install dependencies
> +RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> +        apt install -y --no-install-recommends \
> +        gcc-aarch64-linux-gnu \
> +        libc6-dev-arm64-cross \
> +        gcc-alpha-linux-gnu \
> +        libc6.1-dev-alpha-cross \
> +        gcc-arm-linux-gnueabihf \
> +        libc6-dev-armhf-cross \
> +        gcc-hppa-linux-gnu \
> +        libc6-dev-hppa-cross \
> +        gcc-m68k-linux-gnu \
> +        libc6-dev-m68k-cross \
> +        gcc-mips-linux-gnu \
> +        libc6-dev-mips-cross \
> +        gcc-mips64-linux-gnuabi64 \
> +        libc6-dev-mips64-cross \
> +        gcc-mips64el-linux-gnuabi64 \
> +        libc6-dev-mips64el-cross \
> +        gcc-mipsel-linux-gnu \
> +        libc6-dev-mipsel-cross \
> +        gcc-powerpc-linux-gnu \
> +        libc6-dev-powerpc-cross \
> +        gcc-powerpc64-linux-gnu \
> +        libc6-dev-ppc64-cross \
> +        gcc-powerpc64le-linux-gnu \
> +        libc6-dev-ppc64el-cross \
> +        gcc-riscv64-linux-gnu \
> +        libc6-dev-riscv64-cross \
> +        gcc-s390x-linux-gnu \
> +        libc6-dev-s390x-cross \
> +        gcc-sh4-linux-gnu \
> +        libc6-dev-sh4-cross \
> +        gcc-sparc64-linux-gnu \
> +        libc6-dev-sparc64-cross
> +
> +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
> +ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user
> 



  reply	other threads:[~2020-06-29 10:19 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-26 18:13 [PATCH v3 00/30] testing/next (gitlab, vm, docker) Alex Bennée
2020-06-26 18:13 ` [PATCH v3 01/30] iotests: Fix 051 output after qdev_init_nofail() removal Alex Bennée
2020-06-26 18:13 ` [PATCH v3 02/30] crypto/linux_keyring: fix 'secret_keyring' configure test Alex Bennée
2020-06-26 18:13 ` [PATCH v3 03/30] tests/vm: pass args through to BaseVM's __init__ Alex Bennée
2020-06-26 18:13 ` [PATCH v3 04/30] tests/vm: Add configuration to basevm.py Alex Bennée
2020-06-26 18:13 ` [PATCH v3 05/30] tests/vm: Added configuration file support Alex Bennée
2020-06-26 18:13 ` [PATCH v3 06/30] tests/vm: Add common Ubuntu python module Alex Bennée
2020-06-26 18:13 ` [PATCH v3 07/30] tests/vm: Added a new script for ubuntu.aarch64 Alex Bennée
2020-06-26 18:13 ` [PATCH v3 08/30] tests/vm: Added a new script for centos.aarch64 Alex Bennée
2020-06-26 18:13 ` [PATCH v3 09/30] tests/vm: change scripts to use self._config Alex Bennée
2020-06-29 10:06   ` Philippe Mathieu-Daudé
2020-06-26 18:13 ` [PATCH v3 10/30] python/qemu: Add ConsoleSocket for optional use in QEMUMachine Alex Bennée
2020-06-26 18:13 ` [PATCH v3 11/30] tests/vm: Add workaround to consume console Alex Bennée
2020-06-26 18:13 ` [PATCH v3 12/30] tests/vm: switch from optsparse to argparse Alex Bennée
2020-06-26 18:13 ` [PATCH v3 13/30] tests/vm: allow us to take advantage of MTTCG Alex Bennée
2020-06-26 18:13 ` [PATCH v3 14/30] tests/docker: check for an parameters not empty string Alex Bennée
2020-06-26 18:13 ` [PATCH v3 15/30] tests/docker: change tag naming scheme of our images Alex Bennée
2020-06-29 10:04   ` Philippe Mathieu-Daudé
2020-06-26 18:13 ` [PATCH v3 16/30] .gitignore: un-ignore .gitlab-ci.d Alex Bennée
2020-06-29  9:25   ` Thomas Huth
2020-06-29 10:04   ` Philippe Mathieu-Daudé
2020-06-26 18:13 ` [PATCH v3 17/30] gitlab-ci: Fix the change rules after moving the YML files Alex Bennée
2020-07-02  7:42   ` Laszlo Ersek
2020-06-26 18:13 ` [PATCH v3 18/30] gitlab: introduce explicit "container" and "build" stages Alex Bennée
2020-06-26 18:13 ` [PATCH v3 19/30] gitlab: build all container images during CI Alex Bennée
2020-06-29  9:54   ` Thomas Huth
2020-06-26 18:13 ` [PATCH v3 20/30] gitlab: convert jobs to use custom built containers Alex Bennée
2020-06-29 10:13   ` Thomas Huth
2020-06-26 18:13 ` [PATCH v3 21/30] gitlab: build containers with buildkit and metadata Alex Bennée
2020-06-26 18:13 ` [PATCH v3 22/30] tests/docker: add --registry support to tooling Alex Bennée
2020-06-26 18:13 ` [PATCH v3 23/30] tests/docker: add packages needed for check-acceptance Alex Bennée
2020-06-29 10:11   ` Philippe Mathieu-Daudé
2020-06-29 10:15   ` Thomas Huth
2020-06-26 18:13 ` [PATCH v3 24/30] gitlab: add acceptance testing to system builds Alex Bennée
2020-06-29 10:15   ` Philippe Mathieu-Daudé
2020-06-29 10:36   ` Thomas Huth
2020-06-29 12:51     ` Alex Bennée
2020-06-29 11:12   ` Thomas Huth
2020-06-26 18:13 ` [PATCH v3 25/30] tests/docker: add a linux-user testing focused image Alex Bennée
2020-06-29 10:18   ` Philippe Mathieu-Daudé [this message]
2020-06-26 18:13 ` [PATCH v3 26/30] gitlab: enable check-tcg for linux-user tests Alex Bennée
2020-06-29 10:03   ` Philippe Mathieu-Daudé
2020-06-29 10:42   ` Thomas Huth
2020-06-29 11:03   ` Thomas Huth
2020-06-29 11:35     ` Laurent Vivier
2020-06-29 12:54     ` Alex Bennée
2020-06-26 18:13 ` [PATCH v3 27/30] gitlab: add avocado asset caching Alex Bennée
2020-06-29 12:25   ` Thomas Huth
2020-06-26 18:13 ` [PATCH v3 28/30] gitlab: split build-disabled into two phases Alex Bennée
2020-06-29 10:02   ` Philippe Mathieu-Daudé
2020-06-29 10:58   ` Thomas Huth
2020-06-29 12:57     ` Alex Bennée
2020-06-26 18:13 ` [PATCH v3 29/30] gitlab: limit re-builds of the containers Alex Bennée
2020-06-29 10:01   ` Philippe Mathieu-Daudé
2020-06-29 10:03   ` Daniel P. Berrangé
2020-06-29 10:11     ` Alex Bennée
2020-06-29 11:42       ` Thomas Huth
2020-06-29 11:52         ` Daniel P. Berrangé
2020-06-26 18:13 ` [PATCH v3 30/30] containers.yml: build with docker.py tooling Alex Bennée
2020-06-26 19:13 ` [PATCH v3 00/30] testing/next (gitlab, vm, docker) no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=523f882a-2b1f-2d7c-d13e-b5d6b4f07aa2@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=fam@euphon.net \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).