[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 19/30] gitlab: build all container images during CI
From: |
Thomas Huth |
Subject: |
Re: [PATCH v3 19/30] gitlab: build all container images during CI |
Date: |
Mon, 29 Jun 2020 11:54:41 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 |
On 26/06/2020 20.13, Alex Bennée wrote:
From: Daniel P. Berrangé <berrange@redhat.com>
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>
Message-Id: <20200622153318.751107-3-berrange@redhat.com>
[AJB: tweak the tag format]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@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 00000000000..580439647ef
--- /dev/null
+++ b/.gitlab-ci.d/containers.yml
@@ -0,0 +1,248 @@
+
+
Remove one or two empty lines here?
+.container_job_template: &container_job_definition
+ image: docker:stable
+ stage: containers
+ services:
+ - docker:dind
+ before_script:
+ - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
+ - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest"
+ - docker info
+ - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p
"$CI_REGISTRY_PASSWORD"
+ script:
+ - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
+ - sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/,"
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-ubuntu-container:
+ <<: *container_job_definition
+ variables:
+ NAME: ubuntu
+
"git am" complains:
Applying: gitlab: build all container images during CI
.git/rebase-apply/patch:260: new blank line at EOF.
+
... thus remove the trailing empty line?
Thomas
- Re: [PATCH v3 20/30] gitlab: convert jobs to use custom built containers, (continued)
- [PATCH v3 26/30] gitlab: enable check-tcg for linux-user tests, Alex Bennée, 2020/06/26
- [PATCH v3 15/30] tests/docker: change tag naming scheme of our images, Alex Bennée, 2020/06/26
- [PATCH v3 19/30] gitlab: build all container images during CI, Alex Bennée, 2020/06/26
- Re: [PATCH v3 19/30] gitlab: build all container images during CI,
Thomas Huth <=
- [PATCH v3 23/30] tests/docker: add packages needed for check-acceptance, Alex Bennée, 2020/06/26
- [PATCH v3 28/30] gitlab: split build-disabled into two phases, Alex Bennée, 2020/06/26
- [PATCH v3 29/30] gitlab: limit re-builds of the containers, Alex Bennée, 2020/06/26