diff --git a/merge_into_manifest.py b/merge_into_manifest.py index 1d608e1c74db07e93f070861c8d82b83c5d24d0f..a57124abe5e7fcd6854d53e8d00f83dfa24c04d8 100755 --- a/merge_into_manifest.py +++ b/merge_into_manifest.py @@ -100,30 +100,6 @@ def merge_into_manifest(manifest_project, master_branch, project, commit): print("Successfully merged") - # Check if there is a running pipeline on the integration branch and cancel it. - # This happens when a reintegration was necessary before merging. The instant - # merge afterwards deletes the integration branch, so the pipeline on the branch - # will fail, because repo cannot checkout the code anymore. In order not to - # confuse people, we better cancel it. Since there is a pipeline running on the - # master after merging, we don't need the branch results anyway. - try: - pipelines = manifest_project.pipelines.list( - sha=manifest_revision, - ref=integration_branch, - retry_transient_errors=True, - ) - except GitlabGetError: - print("WARNING: could not list pipelines for project '%s'" % project.name) - if pipelines: - pipeline = pipelines[0] - if pipeline.status in common.pending_states: - pipeline.cancel() - print( - "Cancelling running pipeline for integration branch '%s':" - % integration_branch - ) - print(pipeline.web_url) - return manifest_revision