openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gitlab-ci: Replace YAML anchors by extends (native_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

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210418233448.1267991-3-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-04-19 01:34:35 +02:00 committed by Thomas Huth
parent 1d8b96126e
commit 6683da0951
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
.gitlab-ci.yml
View File

@ -13,7 +13,7 @@ include:
- local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/containers.yml'
- local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds.yml'
.native_build_job_template: &native_build_job_definition .native_build_job_template:
stage: build stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
before_script: before_script:
@ -83,7 +83,7 @@ include:
- du -chs ${CI_PROJECT_DIR}/avocado-cache - du -chs ${CI_PROJECT_DIR}/avocado-cache
build-system-alpine: build-system-alpine:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
- job: amd64-alpine-container - job: amd64-alpine-container
variables: variables:
@ -118,7 +118,7 @@ acceptance-system-alpine:
<<: *acceptance_definition <<: *acceptance_definition
build-system-ubuntu: build-system-ubuntu:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-ubuntu2004-container job: amd64-ubuntu2004-container
variables: variables:
@ -152,7 +152,7 @@ acceptance-system-ubuntu:
<<: *acceptance_definition <<: *acceptance_definition
build-system-debian: build-system-debian:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-container job: amd64-debian-container
variables: variables:
@ -186,7 +186,7 @@ acceptance-system-debian:
<<: *acceptance_definition <<: *acceptance_definition
build-system-fedora: build-system-fedora:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-fedora-container job: amd64-fedora-container
variables: variables:
@ -221,7 +221,7 @@ acceptance-system-fedora:
<<: *acceptance_definition <<: *acceptance_definition
build-system-centos: build-system-centos:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-centos8-container job: amd64-centos8-container
variables: variables:
@ -256,7 +256,7 @@ acceptance-system-centos:
<<: *acceptance_definition <<: *acceptance_definition
build-system-opensuse: build-system-opensuse:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-opensuse-leap-container job: amd64-opensuse-leap-container
variables: variables:
@ -290,7 +290,7 @@ acceptance-system-opensuse:
build-disabled: build-disabled:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-fedora-container job: amd64-fedora-container
variables: variables:
@ -376,7 +376,7 @@ build-disabled:
# Also use a different coroutine implementation (which is only really of # Also use a different coroutine implementation (which is only really of
# interest to KVM users, i.e. with TCG disabled) # interest to KVM users, i.e. with TCG disabled)
build-tcg-disabled: build-tcg-disabled:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-centos8-container job: amd64-centos8-container
variables: variables:
@ -399,7 +399,7 @@ build-tcg-disabled:
260 261 262 263 264 270 272 273 277 279 260 261 262 263 264 270 272 273 277 279
build-user: build-user:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -408,7 +408,7 @@ build-user:
MAKE_CHECK_ARGS: check-tcg MAKE_CHECK_ARGS: check-tcg
build-user-static: build-user-static:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -418,7 +418,7 @@ build-user-static:
# Only build the softmmu targets we have check-tcg tests for # Only build the softmmu targets we have check-tcg tests for
build-some-softmmu: build-some-softmmu:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -431,7 +431,7 @@ build-some-softmmu:
# we skip sparc64-linux-user until it has been fixed somewhat # 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 # we skip cris-linux-user as it doesn't use the common run loop
build-user-plugins: build-user-plugins:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -441,7 +441,7 @@ build-user-plugins:
timeout: 1h 30m timeout: 1h 30m
build-user-centos7: build-user-centos7:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-centos7-container job: amd64-centos7-container
variables: variables:
@ -450,7 +450,7 @@ build-user-centos7:
MAKE_CHECK_ARGS: check-tcg MAKE_CHECK_ARGS: check-tcg
build-some-softmmu-plugins: build-some-softmmu-plugins:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -460,7 +460,7 @@ build-some-softmmu-plugins:
MAKE_CHECK_ARGS: check-tcg MAKE_CHECK_ARGS: check-tcg
clang-system: clang-system:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-fedora-container job: amd64-fedora-container
variables: variables:
@ -472,7 +472,7 @@ clang-system:
MAKE_CHECK_ARGS: check-qtest check-tcg MAKE_CHECK_ARGS: check-qtest check-tcg
clang-user: clang-user:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -494,7 +494,7 @@ clang-user:
# Split in three sets of build/check/acceptance to limit the execution time of each # Split in three sets of build/check/acceptance to limit the execution time of each
# job # job
build-cfi-aarch64: build-cfi-aarch64:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
- job: amd64-fedora-container - job: amd64-fedora-container
variables: variables:
@ -531,7 +531,7 @@ acceptance-cfi-aarch64:
<<: *acceptance_definition <<: *acceptance_definition
build-cfi-ppc64-s390x: build-cfi-ppc64-s390x:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
- job: amd64-fedora-container - job: amd64-fedora-container
variables: variables:
@ -568,7 +568,7 @@ acceptance-cfi-ppc64-s390x:
<<: *acceptance_definition <<: *acceptance_definition
build-cfi-x86_64: build-cfi-x86_64:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
- job: amd64-fedora-container - job: amd64-fedora-container
variables: variables:
@ -605,7 +605,7 @@ acceptance-cfi-x86_64:
<<: *acceptance_definition <<: *acceptance_definition
tsan-build: tsan-build:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-ubuntu2004-container job: amd64-ubuntu2004-container
variables: variables:
@ -617,7 +617,7 @@ tsan-build:
# These targets are on the way out # These targets are on the way out
build-deprecated: build-deprecated:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -644,7 +644,7 @@ check-deprecated:
# gprof/gcov are GCC features # gprof/gcov are GCC features
gprof-gcov: gprof-gcov:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-ubuntu2004-container job: amd64-ubuntu2004-container
variables: variables:
@ -657,7 +657,7 @@ gprof-gcov:
- ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh
build-oss-fuzz: build-oss-fuzz:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-fedora-container job: amd64-fedora-container
variables: variables:
@ -677,7 +677,7 @@ build-oss-fuzz:
- cd build-oss-fuzz && make check-qtest-i386 check-unit - cd build-oss-fuzz && make check-qtest-i386 check-unit
build-tci: build-tci:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
@ -702,7 +702,7 @@ build-tci:
# Alternate coroutines implementations are only really of interest to KVM users # Alternate coroutines implementations are only really of interest to KVM users
# However we can't test against KVM on Gitlab-CI so we can only run unit tests # However we can't test against KVM on Gitlab-CI so we can only run unit tests
build-coroutine-sigaltstack: build-coroutine-sigaltstack:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-ubuntu2004-container job: amd64-ubuntu2004-container
variables: variables:
@ -716,7 +716,7 @@ build-coroutine-sigaltstack:
# These jobs test old gcrypt and nettle from RHEL7 # These jobs test old gcrypt and nettle from RHEL7
# which had some API differences. # which had some API differences.
crypto-old-nettle: crypto-old-nettle:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-centos7-container job: amd64-centos7-container
variables: variables:
@ -726,7 +726,7 @@ crypto-old-nettle:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
crypto-old-gcrypt: crypto-old-gcrypt:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-centos7-container job: amd64-centos7-container
variables: variables:
@ -736,7 +736,7 @@ crypto-old-gcrypt:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
crypto-only-gnutls: crypto-only-gnutls:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-centos7-container job: amd64-centos7-container
variables: variables:
@ -748,7 +748,7 @@ crypto-only-gnutls:
# Check our reduced build configurations # Check our reduced build configurations
build-without-default-devices: build-without-default-devices:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-centos8-container job: amd64-centos8-container
variables: variables:
@ -756,7 +756,7 @@ build-without-default-devices:
CONFIGURE_ARGS: --without-default-devices --disable-user CONFIGURE_ARGS: --without-default-devices --disable-user
build-without-default-features: build-without-default-features:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-container job: amd64-debian-container
variables: variables:
@ -806,7 +806,7 @@ build-libvhost-user:
# No targets are built here, just tools, docs, and unit tests. This # No targets are built here, just tools, docs, and unit tests. This
# also feeds into the eventual documentation deployment steps later # also feeds into the eventual documentation deployment steps later
build-tools-and-docs-debian: build-tools-and-docs-debian:
<<: *native_build_job_definition extends: .native_build_job_template
needs: needs:
job: amd64-debian-container job: amd64-debian-container
variables: variables: