diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-09 10:50:45 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-09 10:50:45 +0000 |
commit | 30011bdce5b7f9df35ca3c6e7ab562950fbb5ebb (patch) | |
tree | 938fd3000e441f9c2618556f936b0c37556110ba | |
parent | 475dd106a80027fae01d3ac3dccc5e80cd3fa9e6 (diff) | |
parent | 471728f8fb7747638c24d918302d6bdcb6d152f2 (diff) | |
download | gitlab-ce-30011bdce5b7f9df35ca3c6e7ab562950fbb5ebb.tar.gz |
Merge branch 'docs/trigger-script' into 'master'
Wait for the pipeline to start before canceling it
See merge request gitlab-org/gitlab-ce!17638
-rwxr-xr-x | scripts/trigger-build-docs | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs index ae8cac0cf02..c9aaba91aa0 100755 --- a/scripts/trigger-build-docs +++ b/scripts/trigger-build-docs @@ -24,8 +24,8 @@ def docs_branch # The maximum string length a file can have on a filesystem (ext4) # is 63 characters. Let's use something smaller to be 100% sure. max = 42 - # Prefix the remote branch with 'preview-' in order to avoid - # name conflicts in the rare case the branch name already + # Prefix the remote branch with the slug of the project in order + # to avoid name conflicts in the rare case the branch name already # exists in the docs repo and truncate to max length. "#{slug}-#{ENV["CI_COMMIT_REF_SLUG"]}"[0...max] end @@ -41,12 +41,21 @@ def create_remote_branch Gitlab.create_branch(GITLAB_DOCS_REPO, docs_branch, 'master') puts "=> Remote branch '#{docs_branch}' created" - # Get the latest pipeline ID which is also the first - pipeline_id = Gitlab.pipelines(GITLAB_DOCS_REPO, { ref: docs_branch }).last.id + pipelines = nil + + # Wait until the pipeline is started + loop do + sleep 1 + puts "=> Waiting for pipeline to start..." + pipelines = Gitlab.pipelines(GITLAB_DOCS_REPO, { ref: docs_branch }) + break if pipelines.any? + end + + # Get the first pipeline ID which should be the only one for the branch + pipeline_id = pipelines.first.id # Cancel the pipeline Gitlab.cancel_pipeline(GITLAB_DOCS_REPO, pipeline_id) - puts "=> Canceled uneeded pipeline #{pipeline_id} for '#{docs_branch}'" rescue Gitlab::Error::BadRequest puts "=> Remote branch '#{docs_branch}' already exists" end |