simplify merge_tree logic and make it work in forks by default
When successfully spawning the child pipelines with merge_tree
enabled, there are at least three different possibilities how things can be setup:
kernel-ark | CI_PROJECT_URL |
CI_MERGE_REQUEST_PROJECT_URL |
---|---|---|
MR fork pipeline | MR source repo | kernel-ark |
MR pipeline | kernel-ark | kernel-ark |
baseline | kernel-ark |
For merge_tree
, the repository has to be specified explicitly. Just using CI_MERGE_REQUEST_PROJECT_URL
breaks in baseline pipelines, and just using CI_MERGE_REQUEST_PROJECT_URL
breaks in MR fork pipelines.
Looking at what is actually done shows that merge_tree
is always the same as git_tree
.
AC:
-
default merge_tree to git_url if not specified, remove merge_tree_cache_owner, remove merge_tree from kernel templates: !1943 (merged) -
remove merge_tree from kernel-ark: kernel-ark!2992 (merged) -
doc updates: documentation!494 (merged)
Edited by Michael Hofmann