[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/10] gitlab-ci: Replace YAML anchors by extends (native_test_job
From: |
Thomas Huth |
Subject: |
[PULL 06/10] gitlab-ci: Replace YAML anchors by extends (native_test_job) |
Date: |
Mon, 3 May 2021 12:44:52 +0200 |
From: Philippe Mathieu-Daudé <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
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210418233448.1267991-4-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.yml | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 442e78a0a7..f01a1dbd7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ include:
make -j"$JOBS" $MAKE_CHECK_ARGS ;
fi
-.native_test_job_template: &native_test_job_definition
+.native_test_job_template:
stage: test
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
script:
@@ -95,7 +95,7 @@ build-system-alpine:
- build
check-system-alpine:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-alpine
artifacts: true
@@ -104,7 +104,7 @@ check-system-alpine:
MAKE_CHECK_ARGS: check
acceptance-system-alpine:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-alpine
artifacts: true
@@ -129,7 +129,7 @@ build-system-ubuntu:
- build
check-system-ubuntu:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-ubuntu
artifacts: true
@@ -138,7 +138,7 @@ check-system-ubuntu:
MAKE_CHECK_ARGS: check
acceptance-system-ubuntu:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-ubuntu
artifacts: true
@@ -163,7 +163,7 @@ build-system-debian:
- build
check-system-debian:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-debian
artifacts: true
@@ -172,7 +172,7 @@ check-system-debian:
MAKE_CHECK_ARGS: check
acceptance-system-debian:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-debian
artifacts: true
@@ -198,7 +198,7 @@ build-system-fedora:
- build
check-system-fedora:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-fedora
artifacts: true
@@ -207,7 +207,7 @@ check-system-fedora:
MAKE_CHECK_ARGS: check
acceptance-system-fedora:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-fedora
artifacts: true
@@ -233,7 +233,7 @@ build-system-centos:
- build
check-system-centos:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-centos
artifacts: true
@@ -242,7 +242,7 @@ check-system-centos:
MAKE_CHECK_ARGS: check
acceptance-system-centos:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-centos
artifacts: true
@@ -266,7 +266,7 @@ build-system-opensuse:
- build
check-system-opensuse:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-opensuse
artifacts: true
@@ -275,7 +275,7 @@ check-system-opensuse:
MAKE_CHECK_ARGS: check
acceptance-system-opensuse:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-system-opensuse
artifacts: true
@@ -509,7 +509,7 @@ build-cfi-aarch64:
- build
check-cfi-aarch64:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-cfi-aarch64
artifacts: true
@@ -518,7 +518,7 @@ check-cfi-aarch64:
MAKE_CHECK_ARGS: check
acceptance-cfi-aarch64:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-cfi-aarch64
artifacts: true
@@ -546,7 +546,7 @@ build-cfi-ppc64-s390x:
- build
check-cfi-ppc64-s390x:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-cfi-ppc64-s390x
artifacts: true
@@ -555,7 +555,7 @@ check-cfi-ppc64-s390x:
MAKE_CHECK_ARGS: check
acceptance-cfi-ppc64-s390x:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-cfi-ppc64-s390x
artifacts: true
@@ -583,7 +583,7 @@ build-cfi-x86_64:
- build
check-cfi-x86_64:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-cfi-x86_64
artifacts: true
@@ -592,7 +592,7 @@ check-cfi-x86_64:
MAKE_CHECK_ARGS: check
acceptance-cfi-x86_64:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-cfi-x86_64
artifacts: true
@@ -630,7 +630,7 @@ build-deprecated:
# We split the check-tcg step as test failures are expected but we still
# want to catch the build breaking.
check-deprecated:
- <<: *native_test_job_definition
+ extends: .native_test_job_template
needs:
- job: build-deprecated
artifacts: true
--
2.27.0
- [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Thomas Huth, 2021/05/03
- [PULL 02/10] tests/docker/dockerfiles: Add ccache to containers where it was missing, Thomas Huth, 2021/05/03
- [PULL 03/10] include/sysemu: Poison all accelerator CONFIG switches in common code, Thomas Huth, 2021/05/03
- [PULL 01/10] Remove the deprecated moxie target, Thomas Huth, 2021/05/03
- [PULL 04/10] gitlab-ci: Replace YAML anchors by extends (container_job), Thomas Huth, 2021/05/03
- [PULL 05/10] gitlab-ci: Replace YAML anchors by extends (native_build_job), Thomas Huth, 2021/05/03
- [PULL 06/10] gitlab-ci: Replace YAML anchors by extends (native_test_job),
Thomas Huth <=
- [PULL 07/10] libqos/qgraph: fix "UNAVAILBLE" typo, Thomas Huth, 2021/05/03
- [PULL 08/10] docs/devel/qgraph: add troubleshooting information, Thomas Huth, 2021/05/03
- [PULL 10/10] util/compatfd.c: Replaced a malloc call with g_malloc., Thomas Huth, 2021/05/03
- [PULL 09/10] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm, Thomas Huth, 2021/05/03
- Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Peter Maydell, 2021/05/05
- Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Thomas Huth, 2021/05/06
- Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Peter Maydell, 2021/05/06
- Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Thomas Huth, 2021/05/07
- Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Paolo Bonzini, 2021/05/07
- Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Thomas Huth, 2021/05/09