From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v2 03/10] gitlab-ci: Extract container job template to container-template.yml
Date: Tue, 11 May 2021 09:29:45 +0200 [thread overview]
Message-ID: <20210511072952.2813358-4-f4bug@amsat.org> (raw)
In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org>
Extract the container job template to a new file
(container-template.yml) to be able to reuse it
without having to run all the jobs included, which
are mainly useful for mainstream CI.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/container-template.yml | 22 ++++++++++++++++++++++
.gitlab-ci.d/containers.yml | 24 ++----------------------
2 files changed, 24 insertions(+), 22 deletions(-)
create mode 100644 .gitlab-ci.d/container-template.yml
diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml
new file mode 100644
index 00000000000..9e3f3ae3c26
--- /dev/null
+++ b/.gitlab-ci.d/container-template.yml
@@ -0,0 +1,22 @@
+.container_job_template:
+ 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"
+ - apk add python3
+ - docker info
+ - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+ script:
+ - echo "TAG:$TAG"
+ - echo "COMMON_TAG:$COMMON_TAG"
+ - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
+ - ./tests/docker/docker.py --engine docker build
+ -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
+ -r $CI_REGISTRY_IMAGE
+ - docker tag "qemu/$NAME" "$TAG"
+ - docker push "$TAG"
+ after_script:
+ - docker logout
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 4ef76d1f54d..0bf4899df10 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -1,25 +1,5 @@
-.container_job_template:
- 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"
- - apk add python3
- - docker info
- - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
- script:
- - echo "TAG:$TAG"
- - echo "COMMON_TAG:$COMMON_TAG"
- - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
- - ./tests/docker/docker.py --engine docker build
- -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
- -r $CI_REGISTRY_IMAGE
- - docker tag "qemu/$NAME" "$TAG"
- - docker push "$TAG"
- after_script:
- - docker logout
+include:
+ - local: '/.gitlab-ci.d/container-template.yml'
amd64-alpine-container:
extends: .container_job_template
--
2.26.3
next prev parent reply other threads:[~2021-05-11 7:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-11 7:29 [PATCH v2 00/10] gitlab-ci: Ease forks pipeline workflow Philippe Mathieu-Daudé
2021-05-11 7:29 ` [PATCH v2 01/10] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Philippe Mathieu-Daudé
2021-05-11 20:24 ` Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 02/10] gitlab-ci: Rename acceptance_test_job -> integration_test_job Philippe Mathieu-Daudé
2021-05-11 7:29 ` Philippe Mathieu-Daudé [this message]
2021-05-11 20:26 ` [PATCH v2 03/10] gitlab-ci: Extract container job template to container-template.yml Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 04/10] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml Philippe Mathieu-Daudé
2021-05-11 20:27 ` Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 05/10] gitlab-ci: Extract DCO/style check jobs to static_checks.yml Philippe Mathieu-Daudé
2021-05-11 20:29 ` Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 06/10] gitlab-ci: Extract build stages to stages.yml Philippe Mathieu-Daudé
2021-05-11 20:32 ` Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 07/10] gitlab-ci: Extract default build/test jobs templates Philippe Mathieu-Daudé
2021-05-11 20:33 ` Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 08/10] gitlab-ci: Extract all default build/test jobs to buildtest.yml Philippe Mathieu-Daudé
2021-05-11 20:35 ` Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 09/10] gitlab-ci: Extract core container jobs to container-core.yml Philippe Mathieu-Daudé
2021-05-11 20:36 ` Willian Rampazzo
2021-05-11 7:29 ` [PATCH v2 10/10] gitlab-ci: Move current job set to qemu-project.yml Philippe Mathieu-Daudé
2021-05-11 20:48 ` Willian Rampazzo
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=20210511072952.2813358-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@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).