gitlab-ci: allow coverage template to disable debug builds again

The .coverage template is supposed to disable debug builds. This was
implemented via test_debug=False before [1].

As .9-common now sets debug_architectures to the complete set, this
needs to be reverted in the .coverage template as well [2].

To actually make that effective, reorder the templates slightly so that
the .coverage template always comes after .9-common. This was already
the case for c9s_automotive_baseline_coverage, but not yet for
c9s_baseline_coverage_build and rhel9_baseline_coverage_build.

JIRA: INTERNAL
Upstream Status: RHEL-only

Fixes https://gitlab.com/cki-project/pipeline-definition/-/issues/236

[1] https://gitlab.com/cki-project/pipeline-definition/-/issues/225
[2] https://gitlab.com/cki-project/pipeline-definition/-/merge_requests/1970

Signed-off-by: Michael Hofmann <mhofmann@redhat.com>
This commit is contained in:
Michael Hofmann 2024-04-09 09:18:12 +02:00
parent dd5d9b7622
commit b7febb967e
No known key found for this signature in database
GPG Key ID: 6FA2623D1460BF6D
1 changed files with 4 additions and 4 deletions

View File

@ -97,8 +97,8 @@ c9s_automotive_check_merge_request:
.automotive_check_common]
c9s_baseline_coverage_build:
extends: [.trusted, .baseline, .rhel_common, .only_build_and_publish, .coverage,
.9-common, .trigger_c9s_pipeline]
extends: [.trusted, .baseline, .rhel_common, .only_build_and_publish,
.9-common, .coverage, .trigger_c9s_pipeline]
c9s_rhel9_compat_merge_request:
extends: [.centos_stream_rhel_internal, .merge_request, .rhel_common, .with_notifications,
@ -137,8 +137,8 @@ rhel9_64k_merge_request:
.64k_full_rhel9]
rhel9_baseline_coverage_build:
extends: [.internal, .baseline, .rhel_common, .only_build_and_publish, .coverage,
.9-common, .trigger_rhel9_pipeline]
extends: [.internal, .baseline, .rhel_common, .only_build_and_publish,
.9-common, .coverage, .trigger_rhel9_pipeline]
# RHEL9 private CI (including RT branches)
rhel9_merge_request_private: