diff --git a/manifest-integration-jobs.yml b/manifest-integration-jobs.yml index fe049d0d465ffbebfc5eee0316c291773dc696a5..a317acd0ad99f4a2101169cb59a2b32c7545340f 100644 --- a/manifest-integration-jobs.yml +++ b/manifest-integration-jobs.yml @@ -55,6 +55,9 @@ build: - if: $CI_MERGE_REQUEST_IID trigger: project: $TARGET_PROJECT + # Attention: CI_PROJECT_NAME contains the *path*, not the *name* of the project. + # Usually these are equal, but it is possible to change the name of a project + # without changing its path. See https://gitlab.com/gitlab-org/gitlab/-/issues/20030 branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${TARGET_BRANCH}" strategy: depend diff --git a/scripts/check_if_integration_branch_is_up_to_date.py b/scripts/check_if_integration_branch_is_up_to_date.py index e2192be89042546250a6167faa73af0bf80d7813..009048a8d8528978aae57f4871ec9596eafad722 100755 --- a/scripts/check_if_integration_branch_is_up_to_date.py +++ b/scripts/check_if_integration_branch_is_up_to_date.py @@ -106,7 +106,7 @@ def main(): ) integration_branch_name = common.integration_branch_name( - source_project.name, merge_request.source_branch, args.target_branch + source_project.path, merge_request.source_branch, args.target_branch ) if check_if_integration_branch_is_up_to_date( diff --git a/scripts/integrate_into_manifest.py b/scripts/integrate_into_manifest.py index 464fe8d2a1ddaa6a1e256fbf30bf47fc30a01501..8f6e0ab5c03a005c837214bc522d7b405af346f7 100755 --- a/scripts/integrate_into_manifest.py +++ b/scripts/integrate_into_manifest.py @@ -122,7 +122,7 @@ def integrate_into_manifest( else: # Create integration branch (delete former one if already exists) integration_branch = common.integration_branch_name( - project.name, merge_request.source_branch, manifest_branch + project.path, merge_request.source_branch, manifest_branch ) for ref in manifest_repo.references: if integration_branch == ref.name: diff --git a/scripts/merge_into_manifest.py b/scripts/merge_into_manifest.py index 00f199f6e8e50a82e4f99e01fde56ebbd69b8ffe..0e9fee4587ea7283a307058f2d01e7c06766ebac 100755 --- a/scripts/merge_into_manifest.py +++ b/scripts/merge_into_manifest.py @@ -56,7 +56,7 @@ def merge_into_manifest( target_branch = manifest_branch integration_branch = common.integration_branch_name( - project.name, original_branch, target_branch + project.path, original_branch, target_branch ) # Create merge request. If there already is a merge request, we assume that it has diff --git a/scripts/update_submodule.py b/scripts/update_submodule.py index f908a0827888521dc4ab87ac9afd9b8d4298f82f..e184ad1ded29152c5fe49894a37537d6a56fcfdc 100755 --- a/scripts/update_submodule.py +++ b/scripts/update_submodule.py @@ -252,7 +252,7 @@ def update_submodule_and_include_ref( # Construct integration branch name integration_branch_name = common.integration_branch_name( - submodule_project.name, integration_branch_suffix, branch + submodule_project.path, integration_branch_suffix, branch ) # Construct commit message