From: Michael Hofmann <mhofmann(a)redhat.com>
gitlab-ci: merge ark-latest fixes when running ELN pipelines
Fixes
https://gitlab.com/cki-project/kernel-ark/-/issues/146
Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -331,35 +331,35 @@ ark_cki_gating:
# ELN CI
eln_merge_request:
- extends: [.merge_request, .trigger_eln, .no_tests, .srpm_for_bot,
+ extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .srpm_for_bot,
.eln_up]
eln_debug_merge_request:
- extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+ extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot,
.eln_up_debug]
# eln_clang_merge_request:
-# extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+# extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest,
.manual_for_bot,
# .eln_clang_up]
#
# eln_clang_debug_merge_request:
-# extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+# extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest,
.manual_for_bot,
# .eln_clang_up_debug]
eln_realtime_merge_request:
- extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+ extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot,
.eln_rt]
eln_realtime_debug_merge_request:
- extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+ extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot,
.eln_rt_debug]
eln_64k_merge_request:
- extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+ extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot,
.eln_64k]
eln_64k_debug_merge_request:
- extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+ extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot,
.eln_64k_debug]
# ELN baselines
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2925