From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v3 03/11] gitlab-ci: Replace YAML anchors by extends (native_build_job)
Date: Sun, 8 Nov 2020 23:19:17 +0100 [thread overview]
Message-ID: <20201108221925.2344515-4-philmd@redhat.com> (raw)
In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com>
'extends' is an alternative to using YAML anchors
and is a little more flexible and readable. See:
https://docs.gitlab.com/ee/ci/yaml/#extends
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
.gitlab-ci.yml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5763318d375..a96e7dd23e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ include:
- local: '/.gitlab-ci.d/containers.yml'
- local: '/.gitlab-ci.d/crossbuilds.yml'
-.native_build_job_template: &native_build_job_definition
+.native_build_job:
stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
before_script:
@@ -68,7 +68,7 @@ include:
- du -chs ${CI_PROJECT_DIR}/avocado-cache
build-system-ubuntu:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: ubuntu2004
TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
@@ -99,7 +99,7 @@ acceptance-system-ubuntu:
<<: *acceptance_definition
build-system-debian:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: debian-amd64
TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu
@@ -130,7 +130,7 @@ acceptance-system-debian:
<<: *acceptance_definition
build-system-fedora:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: fedora
CONFIGURE_ARGS: --disable-gcrypt --enable-nettle
@@ -162,7 +162,7 @@ acceptance-system-fedora:
<<: *acceptance_definition
build-system-centos:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: centos8
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt
@@ -194,7 +194,7 @@ acceptance-system-centos:
<<: *acceptance_definition
build-disabled:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: fedora
CONFIGURE_ARGS: --disable-attr --disable-avx2 --disable-bochs
@@ -219,7 +219,7 @@ build-disabled:
MAKE_CHECK_ARGS: check-qtest SPEED=slow
build-tcg-disabled:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: centos8
script:
@@ -239,7 +239,7 @@ build-tcg-disabled:
260 261 262 263 264 270 272 273 277 279
build-user:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: debian-all-test-cross
CONFIGURE_ARGS: --disable-tools --disable-system
@@ -249,7 +249,7 @@ build-user:
# we skip sparc64-linux-user until it has been fixed somewhat
# we skip cris-linux-user as it doesn't use the common run loop
build-user-plugins:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: debian-all-test-cross
CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user
@@ -257,7 +257,7 @@ build-user-plugins:
timeout: 1h 30m
build-clang:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: fedora
CONFIGURE_ARGS: --cc=clang --cxx=clang++
@@ -267,7 +267,7 @@ build-clang:
# These targets are on the way out
build-deprecated:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: debian-all-test-cross
CONFIGURE_ARGS: --disable-docs --disable-tools
@@ -292,7 +292,7 @@ check-deprecated:
allow_failure: true
build-oss-fuzz:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: fedora
script:
@@ -310,7 +310,7 @@ build-oss-fuzz:
- cd build-oss-fuzz && make check-qtest-i386 check-unit
build-tci:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: fedora
script:
@@ -335,7 +335,7 @@ build-tci:
# These jobs test old gcrypt and nettle from RHEL7
# which had some API differences.
build-crypto-old-nettle:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: centos7
TARGETS: x86_64-softmmu x86_64-linux-user
@@ -356,7 +356,7 @@ check-crypto-old-nettle:
build-crypto-old-gcrypt:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: centos7
TARGETS: x86_64-softmmu x86_64-linux-user
@@ -377,7 +377,7 @@ check-crypto-old-gcrypt:
build-crypto-only-gnutls:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: centos7
TARGETS: x86_64-softmmu x86_64-linux-user
--
2.26.2
next prev parent reply other threads:[~2020-11-08 22:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 22:19 [PATCH v3 00/11] gitlab-ci: Allow forks to select & restrict build jobs Philippe Mathieu-Daudé
2020-11-08 22:19 ` [PATCH v3 01/11] gitlab-ci: Drop generic cache rule Philippe Mathieu-Daudé
2020-11-09 9:46 ` Thomas Huth
2020-11-08 22:19 ` [PATCH v3 02/11] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job) Philippe Mathieu-Daudé
2020-11-10 20:21 ` Wainer dos Santos Moschetta
2020-11-08 22:19 ` Philippe Mathieu-Daudé [this message]
2020-11-10 20:23 ` [PATCH v3 03/11] gitlab-ci: Replace YAML anchors by extends (native_build_job) Wainer dos Santos Moschetta
2020-11-08 22:19 ` [PATCH v3 04/11] gitlab-ci: Replace YAML anchors by extends (native_test_job) Philippe Mathieu-Daudé
2020-11-10 20:24 ` Wainer dos Santos Moschetta
2020-11-08 22:19 ` [PATCH v3 05/11] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Philippe Mathieu-Daudé
2020-11-10 20:35 ` Wainer dos Santos Moschetta
2020-11-08 22:19 ` [PATCH v3 06/11] gitlab-ci: Rename acceptance_test_job -> integration_test_job Philippe Mathieu-Daudé
2020-11-10 20:42 ` Wainer dos Santos Moschetta
2020-11-12 7:02 ` Thomas Huth
2020-11-12 20:31 ` Wainer dos Santos Moschetta
2020-11-16 12:56 ` Philippe Mathieu-Daudé
2020-11-23 15:36 ` Willian Rampazzo
2020-11-08 22:19 ` [PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_common_job' Philippe Mathieu-Daudé
2020-11-09 9:52 ` Thomas Huth
2020-11-10 10:23 ` Philippe Mathieu-Daudé
2020-11-10 20:43 ` Wainer dos Santos Moschetta
2020-11-08 22:19 ` [PATCH v3 08/11] gitlab-ci: Extract common job definition as 'native_common_job' Philippe Mathieu-Daudé
2020-11-10 20:54 ` Wainer dos Santos Moschetta
2020-11-08 22:19 ` [PATCH v3 09/11] gitlab-ci: Add rules to select cross-jobs to build Philippe Mathieu-Daudé
2020-11-09 9:57 ` Thomas Huth
2020-11-08 22:19 ` [PATCH v3 10/11] gitlab-ci: Add rules to select building/testing native jobs Philippe Mathieu-Daudé
2020-11-08 22:19 ` [PATCH v3 11/11] gitlab-ci: Move artifacts expiry rule to common 'native_build_job' Philippe Mathieu-Daudé
2020-11-09 9:59 ` Thomas Huth
2020-11-16 13:01 ` Philippe Mathieu-Daudé
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=20201108221925.2344515-4-philmd@redhat.com \
--to=philmd@redhat.com \
--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 \
/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).