Commit 63137d4e authored by Grzegorz Bizon's avatar Grzegorz Bizon

Add specs for pipeline process with auto-retries

This also resolve a possible race condition - a next stage should not
start until are retries are done in a previous one.
parent a4d301ee
...@@ -97,8 +97,7 @@ module Ci ...@@ -97,8 +97,7 @@ module Ci
end end
end end
after_transition any => [:failed] do |build| before_transition any => [:failed] do |build|
build.run_after_commit do
next if build.retries_max.zero? next if build.retries_max.zero?
if build.retries_count < build.retries_max if build.retries_count < build.retries_max
...@@ -106,7 +105,6 @@ module Ci ...@@ -106,7 +105,6 @@ module Ci
end end
end end
end end
end
def detailed_status(current_user) def detailed_status(current_user)
Gitlab::Ci::Status::Build::Factory Gitlab::Ci::Status::Build::Factory
......
...@@ -463,6 +463,35 @@ describe Ci::ProcessPipelineService, '#execute', :services do ...@@ -463,6 +463,35 @@ describe Ci::ProcessPipelineService, '#execute', :services do
end end
end end
context 'when builds with auto-retries are configured' do
before do
create_build('build:1', stage_idx: 0, user: user, options: { retry: 2 })
create_build('test:1', stage_idx: 1, user: user, when: :on_failure)
create_build('test:2', stage_idx: 1, user: user, options: { retry: 1 })
end
it 'automatically retries builds in a valid order' do
expect(process_pipeline).to be_truthy
fail_running_or_pending
expect(builds_names).to eq %w[build:1 build:1]
expect(builds_statuses).to eq %w[failed pending]
succeed_running_or_pending
expect(builds_names).to eq %w[build:1 build:1 test:2]
expect(builds_statuses).to eq %w[failed success pending]
succeed_running_or_pending
expect(builds_names).to eq %w[build:1 build:1 test:2]
expect(builds_statuses).to eq %w[failed success success]
expect(pipeline.reload).to be_success
end
end
def process_pipeline def process_pipeline
described_class.new(pipeline.project, user).execute(pipeline) described_class.new(pipeline.project, user).execute(pipeline)
end 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