[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 03/16] gitlab-ci: Replace YAML anchors by extends (native_tes
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[RFC PATCH 03/16] gitlab-ci: Replace YAML anchors by extends (native_test_job) |
|
Date: |
Tue, 10 Nov 2020 17:01:27 +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 | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d013504593a..c8fdaecaf51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ include:
make -j"$JOBS" $MAKE_CHECK_ARGS ;
fi
-.native_test_job_template: &native_test_job_definition
+.native_test_job:
stage: test
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
script:
@@ -81,7 +81,7 @@ build-system-ubuntu:
- build
check-system-ubuntu:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-ubuntu
artifacts: true
@@ -90,7 +90,7 @@ check-system-ubuntu:
MAKE_CHECK_ARGS: check
acceptance-system-ubuntu:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-ubuntu
artifacts: true
@@ -113,7 +113,7 @@ build-system-debian:
- build
check-system-debian:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-debian
artifacts: true
@@ -122,7 +122,7 @@ check-system-debian:
MAKE_CHECK_ARGS: check
acceptance-system-debian:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-debian
artifacts: true
@@ -145,7 +145,7 @@ build-system-fedora:
- build
check-system-fedora:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-fedora
artifacts: true
@@ -154,7 +154,7 @@ check-system-fedora:
MAKE_CHECK_ARGS: check
acceptance-system-fedora:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-fedora
artifacts: true
@@ -177,7 +177,7 @@ build-system-centos:
- build
check-system-centos:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-centos
artifacts: true
@@ -186,7 +186,7 @@ check-system-centos:
MAKE_CHECK_ARGS: check
acceptance-system-centos:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-centos
artifacts: true
@@ -284,7 +284,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
needs:
- job: build-deprecated
artifacts: true
@@ -348,7 +348,7 @@ build-crypto-old-nettle:
- build
check-crypto-old-nettle:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-crypto-old-nettle
artifacts: true
@@ -369,7 +369,7 @@ build-crypto-old-gcrypt:
- build
check-crypto-old-gcrypt:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-crypto-old-gcrypt
artifacts: true
@@ -390,7 +390,7 @@ build-crypto-only-gnutls:
- build
check-crypto-only-gnutls:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-crypto-only-gnutls
artifacts: true
--
2.26.2
- [RFC PATCH 00/16] gitlab-ci: Introduce "CI job maintainer" concept, mark jobs maintained, Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 01/16] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 02/16] gitlab-ci: Replace YAML anchors by extends (native_build_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 03/16] gitlab-ci: Replace YAML anchors by extends (native_test_job),
Philippe Mathieu-Daudé <=
- [RFC PATCH 04/16] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 05/16] gitlab-ci: Replace YAML anchors by extends (container_job), Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 06/16] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 07/16] gitlab-ci: Extract common job definition as 'cross_common_job', Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 08/16] gitlab-ci: Extract common job definition as 'native_common_job', Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 09/16] gitlab-ci: Set default workflow rule, Philippe Mathieu-Daudé, 2020/11/10
- [RFC PATCH 10/16] gitlab-ci: Introduce the CI "job maintainer" concept, Philippe Mathieu-Daudé, 2020/11/10