From b7febb967e5e51ff35e5d2782b12498a574b8536 Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Tue, 9 Apr 2024 09:18:12 +0200 Subject: [PATCH] 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 --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d90bd721d245..9c6605efdbd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: