diff --git a/common.py b/common.py index 0632511906817dbf2719fdd7b6169260d98b8996..f7e2b764a194ca1df22ae29ed4cf3ddc494fb299 100755 --- a/common.py +++ b/common.py @@ -23,7 +23,7 @@ def integration_branch_name(project_name, branch_name): def is_gitlab_ci_integration_branch(branch_name): - gitlab_ci_integration_branch = "integrate/.gitlab_ci" + gitlab_ci_integration_branch = "integrate/gitlab_ci" return branch_name.startswith(gitlab_ci_integration_branch) diff --git a/merge_gitlab_ci.py b/merge_gitlab_ci.py index dfabc8417f7684563d6e0f9883cde3e4620b3eba..217419dbcb0e23a91a14a20953a69bb12ac0dc89 100755 --- a/merge_gitlab_ci.py +++ b/merge_gitlab_ci.py @@ -156,11 +156,6 @@ def main(): # deploy_gitlab_ci again to create a new integration # commit or make sure the change is already integrated. - # Store for later usage: - if p == args.project: - manifest_project = project - manifest_integration_mr = mr - print("Merge {}!{}: {}".format(project.name, mr.iid, mr.title)) # Wait until GitLab has checked merge status common.wait_until_merge_status_is_set(project, mr) @@ -194,15 +189,6 @@ def main(): print(" {}".format(p2)) sys.exit() - # Delete args.project (manifests) integration branch - # (skipped the deletion during the merge request merge before) - integration_branch = manifest_project.branches.get( - manifest_integration_mr.source_branch - ) - manifest_project.branches.delete( - integration_branch.get_id(), retry_transient_errors=True - ) - print("Successfully merged") exit() diff --git a/merge_into_manifest.py b/merge_into_manifest.py index e3c6c4fcbd5254465197cba3d1c3d2833e1cf046..93e7714debd989045752b78aadfb862ab40c54d3 100755 --- a/merge_into_manifest.py +++ b/merge_into_manifest.py @@ -42,6 +42,7 @@ def merge_into_manifest( # Get original branch for commit original_branch = source_mr.source_branch + logging.debug("Original branch %s", original_branch) if common.is_gitlab_ci_integration_branch(original_branch): print(