diff --git a/deploy_gitlab_ci.py b/deploy_gitlab_ci.py index 5d7d8ba03f0be19ebc7f209dafbeb36e0f95011a..ec5bb6778e4e6ee9b0df3403bbf537ee4cdea150 100755 --- a/deploy_gitlab_ci.py +++ b/deploy_gitlab_ci.py @@ -3,7 +3,7 @@ import common import argparse import sys -from gitlab import Gitlab, GitlabCreateError +from gitlab import Gitlab from accept_merge_request import accept_merge_request from create_merge_request import create_merge_request from get_merge_requests import get_merge_requests @@ -64,7 +64,7 @@ def main(): project = common.get_project(gitlab, args.project) # Update submodule - integration_branch, integration_commit, submodule_project = update_submodule( + integration_branch, _, submodule_project = update_submodule( project, args.submodule, args.revision, args.branch ) @@ -91,14 +91,6 @@ def main(): else: print("Existing integration merge request:\n%s" % mr.web_url) - # Explicitly trigger a pipeline on the integration branch if it has not run for the - # head commit yet (automatic pipelines are disabled for integration branches) - if not project.pipelines.list(sha=integration_commit): - try: - project.pipelines.create({"ref": integration_branch}) - except GitlabCreateError as e: - sys.exit("ERROR: could not create merge request pipeline: %s" % e) - if not args.merge: print( "Skipping automatic merge in MR context. If you like to extend the "