diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-29 12:09:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-29 12:09:23 +0300 |
commit | 7fd2c757976e33cd231ef844cc0c40b8e8b2b998 (patch) | |
tree | 054fd89896a6b335756b1a032449d078ee0dccc3 /scripts | |
parent | ccd969b8d516264f1d525d81d91388d25b6d4234 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/trigger-build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index aeea25f9ad8..84a970860b0 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -231,7 +231,7 @@ module Trigger # Remove a remote branch in gitlab-docs. # def cleanup! - Gitlab.delete_branch(downstream_project_path, ref) + gitlab_client(:downstream).delete_branch(downstream_project_path, ref) puts "=> Remote branch '#{downstream_project_path}' deleted" end @@ -275,7 +275,7 @@ module Trigger end def create_remote_branch! - Gitlab.create_branch(downstream_project_path, ref, 'master') + gitlab_client(:downstream).create_branch(downstream_project_path, ref, 'master') puts "=> Remote branch '#{ref}' created" rescue Gitlab::Error::BadRequest puts "=> Remote branch '#{ref}' already exists!" @@ -288,7 +288,7 @@ module Trigger loop do sleep 1 puts "=> Waiting for pipeline to start..." - pipelines = Gitlab.pipelines(downstream_project_path, { ref: ref }) + pipelines = gitlab_client(:downstream).pipelines(downstream_project_path, { ref: ref }) break if pipelines.any? end @@ -296,7 +296,7 @@ module Trigger pipeline_id = pipelines.first.id # Cancel the pipeline - Gitlab.cancel_pipeline(downstream_project_path, pipeline_id) + gitlab_client(:downstream).cancel_pipeline(downstream_project_path, pipeline_id) end def display_success_message |