[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 02/16] gitlab-ci: Replace YAML anchors by extends (native_bui
From: |
Philippe Mathieu-Daudé |
Subject: |
[RFC PATCH 02/16] gitlab-ci: Replace YAML anchors by extends (native_build_job) |
Date: |
Tue, 10 Nov 2020 17:01:26 +0100 |
'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 9a8b3751882..d013504593a 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
@@ -100,7 +100,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
@@ -132,7 +132,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 --enable-docs
@@ -164,7 +164,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
@@ -196,7 +196,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
@@ -221,7 +221,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:
@@ -241,7 +241,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
@@ -251,7 +251,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
@@ -259,7 +259,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++
@@ -269,7 +269,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
@@ -294,7 +294,7 @@ check-deprecated:
allow_failure: true
build-oss-fuzz:
- <<: *native_build_job_definition
+ extends: .native_build_job
variables:
IMAGE: fedora
script:
@@ -312,7 +312,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:
@@ -337,7 +337,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
@@ -358,7 +358,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
@@ -379,7 +379,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
- [RFC PATCH 00/16] gitlab-ci: Introduce "CI job maintainer" concept, mark jobs maintained, Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 01/16] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 02/16] gitlab-ci: Replace YAML anchors by extends (native_build_job),
Philippe Mathieu-Daudé <=
- [RFC PATCH 03/16] gitlab-ci: Replace YAML anchors by extends (native_test_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 04/16] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 05/16] gitlab-ci: Replace YAML anchors by extends (container_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 06/16] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 07/16] gitlab-ci: Extract common job definition as 'cross_common_job', Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 08/16] gitlab-ci: Extract common job definition as 'native_common_job', Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 09/16] gitlab-ci: Set default workflow rule, Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 10/16] gitlab-ci: Introduce the CI "job maintainer" concept, Philippe Mathieu-Daudé, 2020/11/10