Commit ea48182a authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Make it clear that pipeline can process processables

parent d16d2b0cd9d4
......@@ -10,7 +10,7 @@ def execute(pipeline)
update_retried
new_builds =
stage_indexes_of_created_builds.map do |index|
stage_indexes_of_created_processables.map do |index|
process_stage(index)
end
......@@ -27,7 +27,7 @@ def process_stage(index)
return if HasStatus::BLOCKED_STATUS.include?(current_status)
if HasStatus::COMPLETED_STATUSES.include?(current_status)
created_builds_in_stage(index).select do |build|
created_processables_in_stage(index).select do |build|
Gitlab::OptimisticLocking.retry_lock(build) do |subject|
Ci::ProcessBuildService.new(project, @user)
.execute(build, current_status)
......@@ -43,18 +43,18 @@ def status_for_prior_stages(index)
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def stage_indexes_of_created_builds
created_builds.order(:stage_idx).pluck('distinct stage_idx')
def stage_indexes_of_created_processables
created_processables.order(:stage_idx).pluck('distinct stage_idx')
end
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def created_builds_in_stage(index)
created_builds.where(stage_idx: index)
def created_processables_in_stage(index)
created_processables.where(stage_idx: index)
end
# rubocop: enable CodeReuse/ActiveRecord
def created_builds
def created_processables
pipeline.processables.created
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment