From fd74201777c771cf911112ce8e196f29f9598dd8 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Tue, 30 Aug 2022 17:09:34 +0200
Subject: [PATCH] deploy_gitlab_ci: fix target branch in integration merge
request
We need to pass the correct target branch to the merge request creation
instead of using the project's default branch.
---
scripts/deploy_gitlab_ci.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/scripts/deploy_gitlab_ci.py b/scripts/deploy_gitlab_ci.py
index 2104aa7a..931a29b3 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,
)
# =================================================
--
GitLab