From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 01/19] gitlab: Replace YAML anchors by extends (acceptance_test_job)
Date: Wed, 26 May 2021 23:18:20 +0200 [thread overview]
Message-ID: <20210526211838.421716-2-f4bug@amsat.org> (raw)
In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org>
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
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-2-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.yml | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a0d311cf40..d6e93369d6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,8 @@ include:
# Avoid recompiling by hiding ninja with NINJA=":"
- make NINJA=":" $MAKE_CHECK_ARGS
-.acceptance_template: &acceptance_definition
+.acceptance_test_job_template:
+ extends: .native_test_job_template
cache:
key: "${CI_JOB_NAME}-cache"
paths:
@@ -108,14 +109,13 @@ check-system-alpine:
MAKE_CHECK_ARGS: check
acceptance-system-alpine:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-system-alpine
artifacts: true
variables:
IMAGE: alpine
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-system-ubuntu:
extends: .native_build_job_template
@@ -142,14 +142,13 @@ check-system-ubuntu:
MAKE_CHECK_ARGS: check
acceptance-system-ubuntu:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-system-ubuntu
artifacts: true
variables:
IMAGE: ubuntu2004
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-system-debian:
extends: .native_build_job_template
@@ -176,14 +175,13 @@ check-system-debian:
MAKE_CHECK_ARGS: check
acceptance-system-debian:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-system-debian
artifacts: true
variables:
IMAGE: debian-amd64
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-system-fedora:
extends: .native_build_job_template
@@ -211,14 +209,13 @@ check-system-fedora:
MAKE_CHECK_ARGS: check
acceptance-system-fedora:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-system-fedora
artifacts: true
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-system-centos:
extends: .native_build_job_template
@@ -246,14 +243,13 @@ check-system-centos:
MAKE_CHECK_ARGS: check
acceptance-system-centos:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-system-centos
artifacts: true
variables:
IMAGE: centos8
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-system-opensuse:
extends: .native_build_job_template
@@ -279,14 +275,13 @@ check-system-opensuse:
MAKE_CHECK_ARGS: check
acceptance-system-opensuse:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-system-opensuse
artifacts: true
variables:
IMAGE: opensuse-leap
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-disabled:
@@ -535,14 +530,13 @@ check-cfi-aarch64:
MAKE_CHECK_ARGS: check
acceptance-cfi-aarch64:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-cfi-aarch64
artifacts: true
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-cfi-ppc64-s390x:
extends: .native_build_job_template
@@ -572,14 +566,13 @@ check-cfi-ppc64-s390x:
MAKE_CHECK_ARGS: check
acceptance-cfi-ppc64-s390x:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-cfi-ppc64-s390x
artifacts: true
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-cfi-x86_64:
extends: .native_build_job_template
@@ -609,14 +602,13 @@ check-cfi-x86_64:
MAKE_CHECK_ARGS: check
acceptance-cfi-x86_64:
- extends: .native_test_job_template
+ extends: .acceptance_test_job_template
needs:
- job: build-cfi-x86_64
artifacts: true
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
tsan-build:
extends: .native_build_job_template
--
2.26.3
next prev parent reply other threads:[~2021-05-26 21:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 21:18 [PULL 00/19] gitlab-ci patches for 2021-05-26 Philippe Mathieu-Daudé
2021-05-26 21:18 ` Philippe Mathieu-Daudé [this message]
2021-05-26 21:18 ` [PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 03/19] gitlab: Enable cross-i386 builds of TCI Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 04/19] gitlab: Extract container job template to container-template.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 05/19] gitlab: Extract crossbuild job templates to crossbuild-template.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 06/19] gitlab: Extract DCO/style check jobs to static_checks.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 07/19] gitlab: Extract build stages to stages.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 08/19] gitlab: Extract default build/test jobs templates Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 09/19] gitlab: Extract core container jobs to container-core.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 10/19] gitlab: Drop linux user build job for CentOS 7 Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 11/19] gitlab: Extract all default build/test jobs to buildtest.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 12/19] gitlab: Move current job set to qemu-project.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 13/19] gitlab: Document how forks can use different set of jobs Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 14/19] gitlab: Extract cross-container jobs to container-cross.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 15/19] gitlab: Keep Avocado reports during 1 week Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 16/19] gitlab: Run Avocado tests manually (except mainstream CI) Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master' Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 18/19] gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 19/19] gitlab: Split gprof-gcov job Philippe Mathieu-Daudé
2021-05-27 7:16 ` Philippe Mathieu-Daudé
2021-05-27 13:56 ` [PULL 00/19] gitlab-ci patches for 2021-05-26 Peter Maydell
2021-05-27 14:51 ` 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=20210526211838.421716-2-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alex.bennee@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@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).