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

CI: deploy_gitlab_ci: Fix merge, integration branch was used after delete

parent 65c6f273
No related branches found
No related tags found
1 merge request!128CI: deploy_gitlab_ci: Fix merge, integration branch was used after delete
Pipeline #9650 passed with stages
in 1 minute and 33 seconds
...@@ -250,6 +250,9 @@ def main(): ...@@ -250,6 +250,9 @@ def main():
) )
# if this has rebased the integration commit needs to be adapted: # if this has rebased the integration commit needs to be adapted:
project_integration[p]["commit"] = integration_commit project_integration[p]["commit"] = integration_commit
# Save the target branch here, as the source branch gets deleted
# during merge
project_integration[p]["branch"] = mr.target_branch
if not merged: if not merged:
sys.exit( sys.exit(
...@@ -298,6 +301,7 @@ def main(): ...@@ -298,6 +301,7 @@ def main():
# get BB_RECIPE_NAME from the projects .gitlab-ci.yml # get BB_RECIPE_NAME from the projects .gitlab-ci.yml
# Use direct read from gitlab as we have not checked out # Use direct read from gitlab as we have not checked out
# the repo if the branch is already up to date # the repo if the branch is already up to date
gitlab_ci_yml = common.get_repository_file_raw( gitlab_ci_yml = common.get_repository_file_raw(
integration["project"], ".gitlab-ci.yml", ref=integration["branch"] integration["project"], ".gitlab-ci.yml", ref=integration["branch"]
) )
......
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