From d9b9517cc381c1717ae2b74f461f372b5866af5e Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Mon, 3 Oct 2022 11:39:43 +0200 Subject: ci: Fix the stage of the api-coverage job The 'extends' stanza supports a list, however there's a merge algorithm in place where a subsequent list entry overwrites all conflicting settings from the previous one - which is exactly what happened here as the gitlab-build-{local,prebuilt}-env job template overwrote api-coverage's stage to 'builds' whereas the original was 'sanity_checks'. Fixes: 4733e2a2d13cb9a85127ba17c04cc29278b31e89 Signed-off-by: Erik Skultety --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 563497e..14d8bc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,8 +72,8 @@ include: '/ci/gitlab.yml' api_coverage_prebuilt_env: extends: - - .api_coverage_job - .gitlab_native_build_job_prebuilt_env + - .api_coverage_job needs: - job: x86_64-centos-stream-8-git-prebuilt-env artifacts: true @@ -82,8 +82,8 @@ api_coverage_prebuilt_env: api_coverage_local_env: extends: - - .api_coverage_job - .gitlab_native_build_job_local_env + - .api_coverage_job needs: - job: x86_64-centos-stream-8-git-local-env artifacts: true -- cgit v1.2.1