From: Michael Hofmann <mhofmann@xxxxxxxxxx> gitlab-ci: merge ark-latest before building in MR pipelines Fixes https://gitlab.com/cki-project/kernel-ark/-/issues/110 Signed-off-by: Michael Hofmann <mhofmann@xxxxxxxxxx> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -161,6 +161,11 @@ workflow: - *only-cki-gating-head - *on-success +.merge_ark_latest: + variables: + merge_tree: ${CI_MERGE_REQUEST_PROJECT_URL}.git + merge_branch: ark-latest + # variants .rawhide_up: variables: @@ -254,35 +259,35 @@ workflow: # Rawhide CI ark_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .srpm_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .srpm_for_bot, .rawhide_up] ark_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_up_debug] ark_16k_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_16k] ark_16k_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_16k_debug] ark_clang_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clang_up] ark_clang_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clang_up_debug] ark_clanglto_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clanglto_up] ark_clanglto_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clanglto_up_debug] # Rawhide baselines @@ -320,7 +325,7 @@ ark_clanglto_debug_baseline: # Rawhide CKI container image gating ark_cki_gating: - extends: [.baseline, .trigger_rawhide, .no_tests, .cki_gating_head, + extends: [.baseline, .trigger_rawhide, .no_tests, .merge_ark_latest, .cki_gating_head, .rawhide_up, .cki_gating_overrides] # ELN CI -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2867 -- _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx 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/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
