summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2020-12-07 14:15:00 +0100
committerThomas Huth2020-12-09 08:04:34 +0100
commitb62ea746487a15813575873e1cb93631671c8b03 (patch)
tree64b2852d557134b5c6acb665c9a6a1b74a5a023d
parentgitlab-ci: Document 'build-tcg-disabled' is a KVM X86 job (diff)
downloadqemu-b62ea746487a15813575873e1cb93631671c8b03.tar.gz
qemu-b62ea746487a15813575873e1cb93631671c8b03.tar.xz
qemu-b62ea746487a15813575873e1cb93631671c8b03.zip
gitlab-ci: Replace YAML anchors by extends (cross_system_build_job)
'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 More importantly it allows exploding YAML jobs. Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20201207131503.3858889-3-philmd@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--.gitlab-ci.d/crossbuilds.yml40
1 files changed, 20 insertions, 20 deletions
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 03ebfabb3f..099949aaef 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -1,5 +1,5 @@
-.cross_system_build_job_template: &cross_system_build_job_definition
+.cross_system_build_job:
stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
timeout: 80m
@@ -13,7 +13,7 @@
xtensa-softmmu"
- make -j$(expr $(nproc) + 1) all check-build
-.cross_user_build_job_template: &cross_user_build_job_definition
+.cross_user_build_job:
stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
script:
@@ -24,91 +24,91 @@
- make -j$(expr $(nproc) + 1) all check-build
cross-armel-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-armel-cross
cross-armel-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-armel-cross
cross-armhf-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-armhf-cross
cross-armhf-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-armhf-cross
cross-arm64-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-arm64-cross
cross-arm64-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-arm64-cross
cross-mips-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-mips-cross
cross-mips-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-mips-cross
cross-mipsel-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-mipsel-cross
cross-mipsel-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-mipsel-cross
cross-mips64el-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-mips64el-cross
cross-mips64el-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-mips64el-cross
cross-ppc64el-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-ppc64el-cross
cross-ppc64el-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-ppc64el-cross
cross-s390x-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: debian-s390x-cross
cross-s390x-user:
- <<: *cross_user_build_job_definition
+ extends: .cross_user_build_job
variables:
IMAGE: debian-s390x-cross
cross-win32-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: fedora-win32-cross
cross-win64-system:
- <<: *cross_system_build_job_definition
+ extends: .cross_system_build_job
variables:
IMAGE: fedora-win64-cross