From: Michael Hofmann <[email protected]> gitlab-ci: do not merge ark-latest for gating pipelines
The cki-gating reference is updated by successful pipelines running on ark-latest. Pulling in ark-latest a second time during the gating pipeline merge stage results in merge conflicts because ark-latest moved forward. Signed-off-by: Michael Hofmann <[email protected]> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -422,35 +422,35 @@ eln_64k_debug_baseline: # ELN CKI container image gating eln_cki_gating: - extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, + extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, .eln_up, .cki_gating_overrides] eln_debug_cki_gating: - extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, + extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, .eln_up_debug, .cki_gating_overrides] # eln_clang_cki_gating: -# extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, +# extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, # .eln_clang_up, .cki_gating_overrides] # # eln_clang_debug_cki_gating: -# extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, +# extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, # .eln_clang_up_debug, .cki_gating_overrides] eln_realtime_cki_gating: # no tests as realtime code not present upstream - extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, + extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, .eln_rt, .cki_gating_overrides] eln_realtime_debug_cki_gating: # no tests as realtime code not present upstream - extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, + extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, .eln_rt_debug, .cki_gating_overrides] eln_64k_cki_gating: - extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, + extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, .eln_64k, .cki_gating_overrides] eln_64k_debug_cki_gating: - extends: [.baseline, .trigger_eln, .no_tests, .merge_ark_latest, .cki_gating_head, + extends: [.baseline, .trigger_eln, .no_tests, .cki_gating_head, .eln_64k_debug, .cki_gating_overrides] # scheduled job -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3028 -- _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
