| Message ID | 20210418233448.1267991-5-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | gitlab-ci: Allow forks to use different pipelines than mainstream | expand |
On 19/04/2021 01.34, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <philmd@redhat.com> > > '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> > --- > .gitlab-ci.yml | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 11bda3abf33..07e5e737685 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -48,7 +48,7 @@ include: > # Avoid recompiling by hiding ninja with NINJA=":" > - make NINJA=":" $MAKE_CHECK_ARGS > > -.acceptance_template: &acceptance_definition > +.acceptance_test_job_template: > cache: > key: "${CI_JOB_NAME}-cache" > paths: > @@ -111,7 +111,7 @@ acceptance-system-alpine: > variables: > IMAGE: alpine > MAKE_CHECK_ARGS: check-acceptance > - <<: *acceptance_definition > + extends: .acceptance_test_job_template FYI, I'm getting "YAML invalid" errors when adding this patch to my staging branch. I guess you cannot use extends twice in a job and you should extend the .acceptance_test_job_template from ..native_build_job_template instead. Thomas
On 5/3/21 11:22 AM, Thomas Huth wrote: > On 19/04/2021 01.34, Philippe Mathieu-Daudé wrote: >> From: Philippe Mathieu-Daudé <philmd@redhat.com> >> >> '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> >> --- >> .gitlab-ci.yml | 20 ++++++++++---------- >> 1 file changed, 10 insertions(+), 10 deletions(-) >> >> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >> index 11bda3abf33..07e5e737685 100644 >> --- a/.gitlab-ci.yml >> +++ b/.gitlab-ci.yml >> @@ -48,7 +48,7 @@ include: >> # Avoid recompiling by hiding ninja with NINJA=":" >> - make NINJA=":" $MAKE_CHECK_ARGS >> -.acceptance_template: &acceptance_definition >> +.acceptance_test_job_template: >> cache: >> key: "${CI_JOB_NAME}-cache" >> paths: >> @@ -111,7 +111,7 @@ acceptance-system-alpine: >> variables: >> IMAGE: alpine >> MAKE_CHECK_ARGS: check-acceptance >> - <<: *acceptance_definition >> + extends: .acceptance_test_job_template > > FYI, I'm getting "YAML invalid" errors when adding this patch to my > staging branch. I guess you cannot use extends twice in a job and you > should extend the .acceptance_test_job_template from > ..native_build_job_template instead. I'm surprised because I tested/used that branch quite a lot. Maybe a job using anchors got added meanwhile and I need to rebase?
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11bda3abf33..07e5e737685 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ include: # Avoid recompiling by hiding ninja with NINJA=":" - make NINJA=":" $MAKE_CHECK_ARGS -.acceptance_template: &acceptance_definition +.acceptance_test_job_template: cache: key: "${CI_JOB_NAME}-cache" paths: @@ -111,7 +111,7 @@ acceptance-system-alpine: variables: IMAGE: alpine MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-system-ubuntu: extends: .native_build_job_template @@ -145,7 +145,7 @@ acceptance-system-ubuntu: variables: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-system-debian: extends: .native_build_job_template @@ -179,7 +179,7 @@ acceptance-system-debian: variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-system-fedora: extends: .native_build_job_template @@ -214,7 +214,7 @@ acceptance-system-fedora: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-system-centos: extends: .native_build_job_template @@ -249,7 +249,7 @@ acceptance-system-centos: variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-system-opensuse: extends: .native_build_job_template @@ -282,7 +282,7 @@ acceptance-system-opensuse: variables: IMAGE: opensuse-leap MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-disabled: @@ -525,7 +525,7 @@ acceptance-cfi-aarch64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-cfi-ppc64-s390x: extends: .native_build_job_template @@ -562,7 +562,7 @@ acceptance-cfi-ppc64-s390x: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template build-cfi-x86_64: extends: .native_build_job_template @@ -599,7 +599,7 @@ acceptance-cfi-x86_64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template tsan-build: extends: .native_build_job_template