diff --git a/scripts/deploy_gitlab_ci.py b/scripts/deploy_gitlab_ci.py index 2104aa7a8eb7f6fa9028795f4a55e0d1bb6752bc..931a29b3f382a5d76846e7b71b8bffc357be05fd 100755 --- a/scripts/deploy_gitlab_ci.py +++ b/scripts/deploy_gitlab_ci.py @@ -6,6 +6,7 @@ import logging import sys import os from gitlab import Gitlab +from gitlab.v4.objects import Project, MergeRequest from accept_merge_request import accept_merge_request from create_merge_request import create_merge_request @@ -79,12 +80,15 @@ def integrate_submodule_into( return ret -def create_integration_merge_request(project, integration_branch_name, source_mr=None): +def create_integration_merge_request( + project: Project, + integration_branch: str, + target_branch: str, + source_mr: MergeRequest = None, +) -> MergeRequest: # Create merge request # This should be optional - mr, created = create_merge_request( - project, integration_branch_name, project.default_branch - ) + mr, created = create_merge_request(project, integration_branch, target_branch) if created: if source_mr is not None: common.crosslink_merge_requests(source_mr, mr) @@ -264,6 +268,7 @@ def main(): mr = create_integration_merge_request( project_integration["project"], project_integration["integration_branch"], + project_integration["master_branch"], source_mr, ) # Now merge @@ -395,6 +400,7 @@ def main(): mr = create_integration_merge_request( integration["project"], integration["integration_branch"], + integration["master_branch"], source_mr, ) # =================================================