From: Thomas Huth <thuth@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>, qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Laszlo Ersek" <lersek@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: Re: [PATCH RFC 2/3] gitlab: build all container images during CI
Date: Thu, 25 Jun 2020 11:35:54 +0200 [thread overview]
Message-ID: <b9da6d29-0615-d96d-5fb7-ba4dc2d5f3d8@redhat.com> (raw)
In-Reply-To: <20200622153318.751107-3-berrange@redhat.com>
On 22/06/2020 17.33, Daniel P. Berrangé wrote:
> We have a number of container images in tests/docker/dockerfiles
> that are intended to provide well defined environments for doing
> test builds. We want our CI system to use these containers too.
>
> This introduces builds of all of them as the first stage in the
> CI, so that the built containers are available for later build
> jobs. The containers are setup to use the GitLab container
> registry as the cache, so we only pay the penalty of the full
> build when the dockerfiles change. The main qemu-project/qemu
> repo is used as a second cache, so that users forking QEMU will
> see a fast turnaround time on their CI jobs.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> .gitlab-ci.d/containers.yml | 248 ++++++++++++++++++++++++++++++++++++
> .gitlab-ci.yml | 3 +
> 2 files changed, 251 insertions(+)
> create mode 100644 .gitlab-ci.d/containers.yml
>
> diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
> new file mode 100644
> index 0000000000..ea1edbb196
> --- /dev/null
> +++ b/.gitlab-ci.d/containers.yml
> @@ -0,0 +1,248 @@
> +
> +
> +.container_job_template: &container_job_definition
> + image: docker:stable
> + stage: containers
> + services:
> + - docker:dind
> + before_script:
> + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
> + - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/ci-$NAME:latest"
> + - docker info
> + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
I can see this in the output:
WARNING! Using --password via the CLI is insecure. Use --password-stdin.
I have to admit that I have only little knowledge about docker ... but
could there be an issue here? Should this be done in a different way?
> + script:
> + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
> + - sed -i -e "s,FROM qemu:,FROM $CI_REGISTRY_IMAGE/ci-," tests/docker/dockerfiles/$NAME.docker
> + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles
> + - docker push "$TAG"
> + after_script:
> + - docker logout
> +
> +amd64-centos7-container:
> + <<: *container_job_definition
> + variables:
> + NAME: centos7
> +
> +amd64-centos8-container:
> + <<: *container_job_definition
> + variables:
> + NAME: centos8
> +
> +amd64-debian10-container:
> + <<: *container_job_definition
> + variables:
> + NAME: debian10
> +
> +amd64-debian11-container:
> + <<: *container_job_definition
> + variables:
> + NAME: debian11
> +
> +amd64-debian9-container:
> + <<: *container_job_definition
> + variables:
> + NAME: debian9
> +
> +amd64-debian9-mxe-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian9-container']
> + variables:
> + NAME: debian9-mxe
> +
> +alpha-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-alpha-cross
> +
> +amd64-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-amd64-cross
> +
> +amd64-debian-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-amd64
> +
> +arm64-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-arm64-cross
> +
> +arm64-test-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian11-container']
> + variables:
> + NAME: debian-arm64-test-cross
> +
> +armel-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-armel-cross
> +
> +armhf-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-armhf-cross
> +
> +hppa-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-hppa-cross
> +
> +m68k-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-m68k-cross
> +
> +mips64-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-mips64-cross
> +
> +mips64el-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-mips64el-cross
> +
> +mips-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-mips-cross
> +
> +mipsel-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-mipsel-cross
> +
> +powerpc-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-powerpc-cross
> +
> +ppc64-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-ppc64-cross
> +
> +ppc64el-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-ppc64el-cross
> +
> +riscv64-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-riscv64-cross
> +
> +s390x-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-s390x-cross
> +
> +sh4-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-sh4-cross
> +
> +sparc64-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian10-container']
> + variables:
> + NAME: debian-sparc64-cross
> +
> +tricore-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer2
> + needs: ['amd64-debian9-container']
> + variables:
> + NAME: debian-tricore-cross
> +
> +win32-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer3
> + needs: ['amd64-debian9-mxe-container']
> + variables:
> + NAME: debian-win32-cross
> +
> +win64-debian-cross-container:
> + <<: *container_job_definition
> + stage: containers-layer3
> + needs: ['amd64-debian9-mxe-container']
> + variables:
> + NAME: debian-win64-cross
> +
> +xtensa-debian-cross-container:
> + <<: *container_job_definition
> + variables:
> + NAME: debian-xtensa-cross
> +
> +cris-fedora-cross-container:
> + <<: *container_job_definition
> + variables:
> + NAME: fedora-cris-cross
> +
> +amd64-fedora-container:
> + <<: *container_job_definition
> + variables:
> + NAME: fedora
> +
> +i386-fedora-cross-container:
> + <<: *container_job_definition
> + variables:
> + NAME: fedora-i386-cross
> +
> +amd64-ubuntu1804-container:
> + <<: *container_job_definition
> + variables:
> + NAME: ubuntu1804
> +
> +amd64-ubuntu2004-container:
> + <<: *container_job_definition
> + variables:
> + NAME: ubuntu2004
> +
> +amd64-ubuntu-container:
> + <<: *container_job_definition
> + variables:
> + NAME: ubuntu
> +
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 9fdc752ea6..72d688875f 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,10 +1,13 @@
> stages:
> - containers
> + - containers-layer2
> + - containers-layer3
> - build
>
> include:
> - local: '/.gitlab-ci.d/edk2.yml'
> - local: '/.gitlab-ci.d/opensbi.yml'
> + - local: '/.gitlab-ci.d/containers.yml'
>
> .update_apt_template: &before_script_apt
> before_script:
>
Acked-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2020-06-25 9:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 15:33 [PATCH RFC 0/3] gitlab: build containers to use in build jobs Daniel P. Berrangé
2020-06-22 15:33 ` [PATCH RFC 1/3] gitlab: introduce explicit "container" and "build" stages Daniel P. Berrangé
2020-06-22 15:59 ` Laszlo Ersek
2020-06-25 8:54 ` Thomas Huth
2020-06-25 8:58 ` Philippe Mathieu-Daudé
2020-06-22 15:33 ` [PATCH RFC 2/3] gitlab: build all container images during CI Daniel P. Berrangé
2020-06-22 15:38 ` Philippe Mathieu-Daudé
2020-06-22 15:46 ` Daniel P. Berrangé
2020-06-22 16:13 ` Philippe Mathieu-Daudé
2020-06-22 18:26 ` Alex Bennée
2020-06-23 8:47 ` Daniel P. Berrangé
2020-06-23 9:35 ` Alex Bennée
2020-06-25 9:35 ` Thomas Huth [this message]
2020-06-25 9:50 ` Daniel P. Berrangé
2020-06-25 15:57 ` Laszlo Ersek
2020-06-25 10:07 ` Daniel P. Berrangé
2020-06-25 11:14 ` Alex Bennée
2020-06-25 10:14 ` Thomas Huth
2020-06-25 10:24 ` Daniel P. Berrangé
2020-06-25 13:25 ` Thomas Huth
2020-06-25 14:29 ` Daniel P. Berrangé
2020-06-22 15:33 ` [PATCH RFC 3/3] gitlab: convert jobs to use custom built containers Daniel P. Berrangé
2020-06-25 9:59 ` Thomas Huth
2020-06-25 10:31 ` [PATCH RFC 0/3] gitlab: build containers to use in build jobs Alex Bennée
2020-06-25 11:15 ` Thomas Huth
2020-06-25 11:26 ` Daniel P. Berrangé
2020-06-25 11:29 ` Daniel P. Berrangé
2020-06-25 11:33 ` Thomas Huth
2020-06-25 11:39 ` Daniel P. Berrangé
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=b9da6d29-0615-d96d-5fb7-ba4dc2d5f3d8@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=lersek@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/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).