Skip to content
Snippets Groups Projects
Commit 6f09c66c authored by Jonas Höppner's avatar Jonas Höppner
Browse files

CI: deploy-gitlab-ci: Don't stop integration when one project is already updated

Prior to this change the integration stop when one of the
projects had already the latest ref of gitlab-ci in to submodule.
parent 6c39166f
No related branches found
No related tags found
1 merge request!147CI: deploy-gitlab-ci: Don't stop integration when one project is already updated
Pipeline #17559 waiting for manual action with stages
in 3 minutes and 37 seconds
......@@ -185,7 +185,7 @@ def main():
project_integration = {}
# Update submodule in all 'child' project
for p in args.projects:
print("Create integration commit is: %s", p)
print("Create integration commit in", p)
res = integrate_submodule_into(
gitlab, p, args.submodule, args.revision, args.branch
......@@ -195,7 +195,7 @@ def main():
if res["commit"] is not None:
project_integration[p] = res
print("Create integration commit in: %s", args.project)
print("Create integration commit in", args.project)
# Update submodule in manifest project
manifest_project = integrate_submodule_into(
gitlab,
......@@ -232,7 +232,7 @@ def main():
)
source_mr = mrs[0]
for p in args.projects:
for p in project_integration:
integration = project_integration[p]
logging.debug("Create MR in %s", integration["project"].name)
mr = create_integration_merge_request(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment