gitlab-ci: Replace YAML anchors by extends (native_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 Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20210418233448.1267991-4-f4bug@amsat.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
6683da0951
commit
e267ce5900
|
@ -41,7 +41,7 @@ include:
|
||||||
make -j"$JOBS" $MAKE_CHECK_ARGS ;
|
make -j"$JOBS" $MAKE_CHECK_ARGS ;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.native_test_job_template: &native_test_job_definition
|
.native_test_job_template:
|
||||||
stage: test
|
stage: test
|
||||||
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
|
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
|
||||||
script:
|
script:
|
||||||
|
@ -99,7 +99,7 @@ build-system-alpine:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-system-alpine:
|
check-system-alpine:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-alpine
|
- job: build-system-alpine
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -108,7 +108,7 @@ check-system-alpine:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-alpine:
|
acceptance-system-alpine:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-alpine
|
- job: build-system-alpine
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -133,7 +133,7 @@ build-system-ubuntu:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-system-ubuntu:
|
check-system-ubuntu:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-ubuntu
|
- job: build-system-ubuntu
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -142,7 +142,7 @@ check-system-ubuntu:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-ubuntu:
|
acceptance-system-ubuntu:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-ubuntu
|
- job: build-system-ubuntu
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -167,7 +167,7 @@ build-system-debian:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-system-debian:
|
check-system-debian:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-debian
|
- job: build-system-debian
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -176,7 +176,7 @@ check-system-debian:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-debian:
|
acceptance-system-debian:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-debian
|
- job: build-system-debian
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -202,7 +202,7 @@ build-system-fedora:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-system-fedora:
|
check-system-fedora:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-fedora
|
- job: build-system-fedora
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -211,7 +211,7 @@ check-system-fedora:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-fedora:
|
acceptance-system-fedora:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-fedora
|
- job: build-system-fedora
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -237,7 +237,7 @@ build-system-centos:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-system-centos:
|
check-system-centos:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-centos
|
- job: build-system-centos
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -246,7 +246,7 @@ check-system-centos:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-centos:
|
acceptance-system-centos:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-centos
|
- job: build-system-centos
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -270,7 +270,7 @@ build-system-opensuse:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-system-opensuse:
|
check-system-opensuse:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-opensuse
|
- job: build-system-opensuse
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -279,7 +279,7 @@ check-system-opensuse:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-opensuse:
|
acceptance-system-opensuse:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-opensuse
|
- job: build-system-opensuse
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -512,7 +512,7 @@ build-cfi-aarch64:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-cfi-aarch64:
|
check-cfi-aarch64:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-aarch64
|
- job: build-cfi-aarch64
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -521,7 +521,7 @@ check-cfi-aarch64:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-cfi-aarch64:
|
acceptance-cfi-aarch64:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-aarch64
|
- job: build-cfi-aarch64
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -549,7 +549,7 @@ build-cfi-ppc64-s390x:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-cfi-ppc64-s390x:
|
check-cfi-ppc64-s390x:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-ppc64-s390x
|
- job: build-cfi-ppc64-s390x
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -558,7 +558,7 @@ check-cfi-ppc64-s390x:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-cfi-ppc64-s390x:
|
acceptance-cfi-ppc64-s390x:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-ppc64-s390x
|
- job: build-cfi-ppc64-s390x
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -586,7 +586,7 @@ build-cfi-x86_64:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
check-cfi-x86_64:
|
check-cfi-x86_64:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-x86_64
|
- job: build-cfi-x86_64
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -595,7 +595,7 @@ check-cfi-x86_64:
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-cfi-x86_64:
|
acceptance-cfi-x86_64:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-x86_64
|
- job: build-cfi-x86_64
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
@ -633,7 +633,7 @@ build-deprecated:
|
||||||
# We split the check-tcg step as test failures are expected but we still
|
# We split the check-tcg step as test failures are expected but we still
|
||||||
# want to catch the build breaking.
|
# want to catch the build breaking.
|
||||||
check-deprecated:
|
check-deprecated:
|
||||||
<<: *native_test_job_definition
|
extends: .native_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-deprecated
|
- job: build-deprecated
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
|
Loading…
Reference in New Issue