[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/15] gitlab-ci: Replace YAML anchors by extends (acceptance_tes
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH 04/15] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) |
|
Date: |
Mon, 19 Apr 2021 01:34:37 +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>
---
.gitlab-ci.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11bda3abf33..07e5e737685 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ include:
# Avoid recompiling by hiding ninja with NINJA=":"
- make NINJA=":" $MAKE_CHECK_ARGS
-.acceptance_template: &acceptance_definition
+.acceptance_test_job_template:
cache:
key: "${CI_JOB_NAME}-cache"
paths:
@@ -111,7 +111,7 @@ acceptance-system-alpine:
variables:
IMAGE: alpine
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-system-ubuntu:
extends: .native_build_job_template
@@ -145,7 +145,7 @@ acceptance-system-ubuntu:
variables:
IMAGE: ubuntu2004
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-system-debian:
extends: .native_build_job_template
@@ -179,7 +179,7 @@ acceptance-system-debian:
variables:
IMAGE: debian-amd64
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-system-fedora:
extends: .native_build_job_template
@@ -214,7 +214,7 @@ acceptance-system-fedora:
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-system-centos:
extends: .native_build_job_template
@@ -249,7 +249,7 @@ acceptance-system-centos:
variables:
IMAGE: centos8
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-system-opensuse:
extends: .native_build_job_template
@@ -282,7 +282,7 @@ acceptance-system-opensuse:
variables:
IMAGE: opensuse-leap
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-disabled:
@@ -525,7 +525,7 @@ acceptance-cfi-aarch64:
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-cfi-ppc64-s390x:
extends: .native_build_job_template
@@ -562,7 +562,7 @@ acceptance-cfi-ppc64-s390x:
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
build-cfi-x86_64:
extends: .native_build_job_template
@@ -599,7 +599,7 @@ acceptance-cfi-x86_64:
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
+ extends: .acceptance_test_job_template
tsan-build:
extends: .native_build_job_template
--
2.26.3
- [RFC PATCH 00/15] gitlab-ci: Allow forks to use different pipelines than mainstream, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 01/15] gitlab-ci: Replace YAML anchors by extends (container_job), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 02/15] gitlab-ci: Replace YAML anchors by extends (native_build_job), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 03/15] gitlab-ci: Replace YAML anchors by extends (native_test_job), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 04/15] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job),
Philippe Mathieu-Daudé <=
- [PATCH 05/15] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 06/15] gitlab-ci: Extract container job template to container-template.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 07/15] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 08/15] gitlab-ci: Extract DCO/style check jobs to checks.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 09/15] gitlab-ci: Extract build stages to stages.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 10/15] gitlab-ci: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/04/18