[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/11] gitlab-ci: Replace YAML anchors by extends (acceptance_
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 05/11] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) |
Date: |
Sun, 8 Nov 2020 23:19:19 +0100 |
'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>
---
.gitlab-ci.yml | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e11f80f6d65..0ef814764a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,8 @@ include:
- find . -type f -exec touch {} +
- make $MAKE_CHECK_ARGS
-.acceptance_template: &acceptance_definition
+.acceptance_test_job:
+ extends: .native_test_job
cache:
key: "${CI_JOB_NAME}-cache"
paths:
@@ -89,14 +90,13 @@ check-system-ubuntu:
MAKE_CHECK_ARGS: check
acceptance-system-ubuntu:
- extends: .native_test_job
+ extends: .acceptance_test_job
needs:
- job: build-system-ubuntu
artifacts: true
variables:
IMAGE: ubuntu2004
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-system-debian:
extends: .native_build_job
@@ -120,14 +120,13 @@ check-system-debian:
MAKE_CHECK_ARGS: check
acceptance-system-debian:
- extends: .native_test_job
+ extends: .acceptance_test_job
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
@@ -152,14 +151,13 @@ check-system-fedora:
MAKE_CHECK_ARGS: check
acceptance-system-fedora:
- extends: .native_test_job
+ extends: .acceptance_test_job
needs:
- job: build-system-fedora
artifacts: true
variables:
IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-system-centos:
extends: .native_build_job
@@ -184,14 +182,13 @@ check-system-centos:
MAKE_CHECK_ARGS: check
acceptance-system-centos:
- extends: .native_test_job
+ extends: .acceptance_test_job
needs:
- job: build-system-centos
artifacts: true
variables:
IMAGE: centos8
MAKE_CHECK_ARGS: check-acceptance
- <<: *acceptance_definition
build-disabled:
extends: .native_build_job
--
2.26.2
- [PATCH v3 00/11] gitlab-ci: Allow forks to select & restrict build jobs, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH v3 01/11] gitlab-ci: Drop generic cache rule, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH v3 02/11] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job), Philippe Mathieu-Daudé, 2020/11/08
- [PATCH v3 03/11] gitlab-ci: Replace YAML anchors by extends (native_build_job), Philippe Mathieu-Daudé, 2020/11/08
- [PATCH v3 04/11] gitlab-ci: Replace YAML anchors by extends (native_test_job), Philippe Mathieu-Daudé, 2020/11/08
- [PATCH v3 05/11] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job),
Philippe Mathieu-Daudé <=
- [PATCH v3 06/11] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Philippe Mathieu-Daudé, 2020/11/08
- Re: [PATCH v3 06/11] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Willian Rampazzo, 2020/11/23
[PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_common_job', Philippe Mathieu-Daudé, 2020/11/08