summaryrefslogtreecommitdiff
path: root/lib/api/commit_statuses.rb
diff options
context:
space:
mode:
authorGaetan Semet <gaetan.semet@renault.com>2019-07-15 14:47:47 +0200
committerMatija Čupić <matteeyah@gmail.com>2019-07-17 14:43:15 +0200
commit4e814c257b74ac78a50f54ec57b1e1c7f78d43b7 (patch)
tree0d18c4f71652af5727e9e156081261c7551d072d /lib/api/commit_statuses.rb
parent4f95a8d7f6612e8df138bd831db7f689a01ef9ca (diff)
downloadgitlab-ce-4e814c257b74ac78a50f54ec57b1e1c7f78d43b7.tar.gz
Multiple pipeline support for Build status
This allows user to specify the pipeline ID when several pipelines has been triggered on the same branch and commit. Signed-off-by: Gaetan Semet <gaetan.semet@renault.com>
Diffstat (limited to 'lib/api/commit_statuses.rb')
-rw-r--r--lib/api/commit_statuses.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 08b4f8db8b0..61cf929bcdc 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -52,6 +52,7 @@ module API
optional :name, type: String, desc: 'A string label to differentiate this status from the status of other systems. Default: "default"'
optional :context, type: String, desc: 'A string label to differentiate this status from the status of other systems. Default: "default"'
optional :coverage, type: Float, desc: 'The total code coverage'
+ optional :pipeline_id, type: Integer, desc: 'An existing pipeline id, when multiple pipelines on the same commit sha have been triggered'
end
# rubocop: disable CodeReuse/ActiveRecord
post ':id/statuses/:sha' do
@@ -72,8 +73,12 @@ module API
not_found! 'References for commit' unless ref
name = params[:name] || params[:context] || 'default'
+ pipeline = if params[:pipeline_id]
+ @project.ci_pipelines.find_by(id: params[:pipeline_id])
+ else
+ @project.pipeline_for(ref, commit.sha)
+ end
- pipeline = @project.pipeline_for(ref, commit.sha)
unless pipeline
pipeline = @project.ci_pipelines.create!(
source: :external,