Re: [PATCH v3 05/11] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job)

[Wainer dos Santos Moschetta]

On 11/8/20 8:19 PM, Philippe Mathieu-Daudé wrote:

'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é <phi...@redhat.com>
---
  .gitlab-ci.yml | 15 ++++++---------
  1 file changed, 6 insertions(+), 9 deletions(-)

LGTM

Reviewed-by: Wainer dos Santos Moschetta <waine...@redhat.com>

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