Skip to content
Snippets Groups Projects
Commit a4b201d1 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé
Browse files

gitlab: Replace YAML anchors by extends (acceptance_test_job)

'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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarWainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: default avatarWillian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-2-f4bug@amsat.org>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 8385235b
No related branches found
No related tags found
No related merge requests found
...@@ -52,7 +52,8 @@ include: ...@@ -52,7 +52,8 @@ include:
# Avoid recompiling by hiding ninja with NINJA=":" # Avoid recompiling by hiding ninja with NINJA=":"
- make NINJA=":" $MAKE_CHECK_ARGS - make NINJA=":" $MAKE_CHECK_ARGS
.acceptance_template: &acceptance_definition .acceptance_test_job_template:
extends: .native_test_job_template
cache: cache:
key: "${CI_JOB_NAME}-cache" key: "${CI_JOB_NAME}-cache"
paths: paths:
...@@ -108,14 +109,13 @@ check-system-alpine: ...@@ -108,14 +109,13 @@ check-system-alpine:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-system-alpine: acceptance-system-alpine:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-system-alpine - job: build-system-alpine
artifacts: true artifacts: true
variables: variables:
IMAGE: alpine IMAGE: alpine
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-system-ubuntu: build-system-ubuntu:
extends: .native_build_job_template extends: .native_build_job_template
...@@ -142,14 +142,13 @@ check-system-ubuntu: ...@@ -142,14 +142,13 @@ check-system-ubuntu:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-system-ubuntu: acceptance-system-ubuntu:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-system-ubuntu - job: build-system-ubuntu
artifacts: true artifacts: true
variables: variables:
IMAGE: ubuntu2004 IMAGE: ubuntu2004
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-system-debian: build-system-debian:
extends: .native_build_job_template extends: .native_build_job_template
...@@ -176,14 +175,13 @@ check-system-debian: ...@@ -176,14 +175,13 @@ check-system-debian:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-system-debian: acceptance-system-debian:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-system-debian - job: build-system-debian
artifacts: true artifacts: true
variables: variables:
IMAGE: debian-amd64 IMAGE: debian-amd64
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-system-fedora: build-system-fedora:
extends: .native_build_job_template extends: .native_build_job_template
...@@ -211,14 +209,13 @@ check-system-fedora: ...@@ -211,14 +209,13 @@ check-system-fedora:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-system-fedora: acceptance-system-fedora:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-system-fedora - job: build-system-fedora
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-system-centos: build-system-centos:
extends: .native_build_job_template extends: .native_build_job_template
...@@ -246,14 +243,13 @@ check-system-centos: ...@@ -246,14 +243,13 @@ check-system-centos:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-system-centos: acceptance-system-centos:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-system-centos - job: build-system-centos
artifacts: true artifacts: true
variables: variables:
IMAGE: centos8 IMAGE: centos8
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-system-opensuse: build-system-opensuse:
extends: .native_build_job_template extends: .native_build_job_template
...@@ -279,14 +275,13 @@ check-system-opensuse: ...@@ -279,14 +275,13 @@ check-system-opensuse:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-system-opensuse: acceptance-system-opensuse:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-system-opensuse - job: build-system-opensuse
artifacts: true artifacts: true
variables: variables:
IMAGE: opensuse-leap IMAGE: opensuse-leap
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-disabled: build-disabled:
...@@ -535,14 +530,13 @@ check-cfi-aarch64: ...@@ -535,14 +530,13 @@ check-cfi-aarch64:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-cfi-aarch64: acceptance-cfi-aarch64:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-cfi-aarch64 - job: build-cfi-aarch64
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-cfi-ppc64-s390x: build-cfi-ppc64-s390x:
extends: .native_build_job_template extends: .native_build_job_template
...@@ -572,14 +566,13 @@ check-cfi-ppc64-s390x: ...@@ -572,14 +566,13 @@ check-cfi-ppc64-s390x:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-cfi-ppc64-s390x: acceptance-cfi-ppc64-s390x:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-cfi-ppc64-s390x - job: build-cfi-ppc64-s390x
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
build-cfi-x86_64: build-cfi-x86_64:
extends: .native_build_job_template extends: .native_build_job_template
...@@ -609,14 +602,13 @@ check-cfi-x86_64: ...@@ -609,14 +602,13 @@ check-cfi-x86_64:
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
acceptance-cfi-x86_64: acceptance-cfi-x86_64:
extends: .native_test_job_template extends: .acceptance_test_job_template
needs: needs:
- job: build-cfi-x86_64 - job: build-cfi-x86_64
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-acceptance MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
tsan-build: tsan-build:
extends: .native_build_job_template extends: .native_build_job_template
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment