CI: deploy-gitlab-ci: Cleanup

deploy_gitlab_ci.py

@@ -6,7 +6,8 @@ import logging
 import sys
 import os
 from gitlab import Gitlab
-from accept_merge_request import accept_merge_request
+
+# from accept_merge_request import accept_merge_request
 from create_merge_request import create_merge_request
 from get_merge_requests import get_merge_requests
 from update_submodule import update_submodule
@@ -100,7 +101,9 @@ def update_rev_in_gitlab_ci(repo, submodule_project, submodule_revision):
         logging.debug(fp.read())
 
 
-def deploy_into(project, submodule, revision, branch, replace_existing_branch=False):
+def deploy_into(
+    project, submodule, revision, branch, replace_existing_branch=False, create_mr=False
+):
     """Update the submodule and include refs to the submodule in the given project.
         Create mergerequest if needed.
 
@@ -116,7 +119,7 @@ def deploy_into(project, submodule, revision, branch, replace_existing_branch=Fa
         merge_request (gitlab mr): Mergerequest for the integration branch
     """
     # Update submodule
-    integration_branch, _, submodule_project = update_submodule(
+    integration_branch, integration_commit, submodule_project = update_submodule(
         project,
         submodule,
         revision,
@@ -125,11 +128,13 @@ def deploy_into(project, submodule, revision, branch, replace_existing_branch=Fa
         replace_existing_branch=replace_existing_branch,
     )
 
-    logging.debug("Integration branch: %s", integration_branch)
+    logging.debug("Integration branch: %s, %s", integration_branch, integration_commit)
 
     # If submodule is already at specified revision, return directly
-    if not integration_branch:
-        return None, submodule_project
+    if not integration_branch or not create_mr:
+        # No commit needed as the submodule is already up to date (integration_branch == None)
+        # Or we are done, because no merge request is needed yet
+        return integration_branch, integration_commit, None
 
     # Get source merge request
     mrs = get_merge_requests(
@@ -145,6 +150,7 @@ def deploy_into(project, submodule, revision, branch, replace_existing_branch=Fa
     source_mr = mrs[0]
 
     # Create merge request
+    # This should be optional
     mr, created = create_merge_request(
         project, integration_branch, project.default_branch
     )
@@ -153,7 +159,7 @@ def deploy_into(project, submodule, revision, branch, replace_existing_branch=Fa
         print("Created new merge request:\n%s" % mr.web_url)
     else:
         print("Existing integration merge request:\n%s" % mr.web_url)
-    return integration_branch, mr
+    return integration_branch, integration_commit, mr
 
 
 def main():
@@ -221,38 +227,35 @@ def main():
         logging.basicConfig(level=logging.DEBUG)
 
     gitlab = Gitlab(args.gitlab_url, private_token=args.token)
-    project = common.get_project(gitlab, args.project)
-
-    logging.debug("Integrate into: %s", args.project)
-
-    # Update submodule in this project, create MR
-    integration_branch, mr = deploy_into(
-        project,
-        args.submodule,
-        args.revision,
-        args.branch,
-        replace_existing_branch=len(args.projects) > 0,
-    )
-    merge_request_manifest = mr
-    merge_requests = []
 
-    # If submodule is already at specified revision, exit successfully
-    if not integration_branch:
-        sys.exit(0)
-
-    for p in args.projects:
-        gitlab_p = common.get_project(gitlab, p)
+    project_integration = {}
+    # Update submodule in this project, create MR if needed TODO
+    for p in args.projects + [args.project]:
         logging.debug("Integrate into: %s", p)
 
-        integration_branch, mr = deploy_into(
-            gitlab_p,
+        gitlab_project = common.get_project(gitlab, p)
+
+        integration_branch, integration_commit, mr = deploy_into(
+            gitlab_project,
             args.submodule,
             args.revision,
             args.branch,
+            replace_existing_branch=len(args.projects) > 0,
         )
-        merge_requests.append(mr)
+        if integration_branch is not None:
+            project_integration[p] = {
+                "project": gitlab_project,
+                "mr": mr,
+                "branch": integration_branch,
+                "commit": integration_commit,
+            }
+            logging.debug(
+                "Integration branch: %s (%s)", integration_branch, integration_commit
+            )
 
-        logging.debug("Integration branch: %s", integration_branch)
+    # If submodule is already at specified revision in all projects, exit successfully
+    if not len(project_integration) == 0:
+        sys.exit(0)
 
     if not args.merge:
         print(
@@ -264,23 +267,24 @@ def main():
         sys.exit(0)
 
     # The manifest needs to be merged at last
-    merge_requests.append(merge_request_manifest)
-    for mr in merge_requests:
-        logging.debug("Merge %s", mr)
-        # Wait until GitLab has checked merge status
-        common.wait_until_merge_status_is_set(project, mr)
-
-        # Attempt to merge
-        merged = accept_merge_request(project, mr, rebase=True)
-
-        if not merged:
-            sys.exit(
-                "Integration MR could not be merged. You have two possibilities to fix "
-                "this:\n"
-                "  1. Checkout the MR and rebase it on the current master manually, or\n"
-                "  2. Delete the MR (Edit -> Delete in the MR UI)\n"
-                "In either case restart this job afterwards in order to get it merged."
-            )
+    # TODO this is currently not used
+    # merge_requests.append(merge_request_manifest)
+    # for mr in merge_requests:
+    #    logging.debug("Merge %s", mr)
+    #    # Wait until GitLab has checked merge status
+    #    common.wait_until_merge_status_is_set(project, mr)
+
+    #    # Attempt to merge
+    #    merged = accept_merge_request(project, mr, rebase=True)
+
+    #    if not merged:
+    #        sys.exit(
+    #            "Integration MR could not be merged. You have two possibilities to fix "
+    #            "this:\n"
+    #            "  1. Checkout the MR and rebase it on the current master manually, or\n"
+    #            "  2. Delete the MR (Edit -> Delete in the MR UI)\n"
+    #            "In either case restart this job afterwards in order to get it merged."
+    #        )
 
     print("Successfully merged")