[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 3/9] gitlab-ci: Replace YAML anchors by extends (native_test_
From: |
Philippe Mathieu-Daudé |
Subject: |
[RFC PATCH 3/9] gitlab-ci: Replace YAML anchors by extends (native_test_job) |
Date: |
Wed, 4 Nov 2020 23:45:52 +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 ff3a8bd58cf..83beefa2c85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,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:
@@ -86,7 +86,7 @@ build-system-ubuntu:
- build
check-system-ubuntu:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-ubuntu
artifacts: true
@@ -95,7 +95,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
@@ -117,7 +117,7 @@ build-system-debian:
- build
check-system-debian:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-debian
artifacts: true
@@ -126,7 +126,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
@@ -149,7 +149,7 @@ build-system-fedora:
- build
check-system-fedora:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-fedora
artifacts: true
@@ -158,7 +158,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
@@ -181,7 +181,7 @@ build-system-centos:
- build
check-system-centos:
- <<: *native_test_job_definition
+ extends: .native_test_job
needs:
- job: build-system-centos
artifacts: true
@@ -190,7 +190,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
@@ -288,7 +288,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
@@ -352,7 +352,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
@@ -373,7 +373,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
@@ -394,7 +394,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 0/9] gitlab-ci: Allow forks to skip some build jobs, Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 1/9] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job), Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 2/9] gitlab-ci: Replace YAML anchors by extends (native_build_job), Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 3/9] gitlab-ci: Replace YAML anchors by extends (native_test_job),
Philippe Mathieu-Daudé <=
- [RFC PATCH 4/9] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job), Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 5/9] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 6/9] gitlab-ci: Extract common job definition as 'cross_common_job', Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 8/9] gitlab-ci: Add rules to skip building cross-jobs, Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 9/9] gitlab-ci: Add rules to skip building/testing native jobs, Philippe Mathieu-Daudé, 2020/11/04
- [RFC PATCH 7/9] gitlab-ci: Extract common job definition as 'native_common_job', Philippe Mathieu-Daudé, 2020/11/04
- Re: [RFC PATCH 0/9] gitlab-ci: Allow forks to skip some build jobs, Philippe Mathieu-Daudé, 2020/11/05