diff options
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/pipeline.rb | 5 | ||||
| -rw-r--r-- | spec/models/build_spec.rb | 16 | ||||
| -rw-r--r-- | spec/models/ci/pipeline_spec.rb | 24 |
4 files changed, 33 insertions, 14 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 21c0e128b98..58f25b20acf 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -97,7 +97,7 @@ module Ci end def other_actions - pipeline.manual_actions.where.not(id: self) + pipeline.manual_actions.where.not(name: name) end def playable? diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index ad117e3950d..88fa01c896d 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -212,8 +212,9 @@ module Ci # build builds only for the first stage that has builds available. # stages.any? do |stage| - CreateBuildsService.new(self) - .execute(stage, user, status, trigger_request).present? + CreateBuildsService.new(self). + execute(stage, user, status, trigger_request). + any?(&:active?) end end diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index f9c9725a23d..2de305738cc 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -808,6 +808,22 @@ describe Ci::Build, models: true do it 'returns other actions' do is_expected.to contain_exactly(other_build) end + + context 'when build is retried' do + let!(:new_build) { Ci::Build.retry(build) } + + it 'does not return any of them' do + is_expected.not_to include(build, new_build) + end + end + + context 'when other build is retried' do + let!(:retried_build) { Ci::Build.retry(other_build) } + + it 'returns a retried build' do + is_expected.to contain_exactly(retried_build) + end + end end describe '#play' do diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index c29e4811385..a3bd8fdf30b 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -264,7 +264,7 @@ describe Ci::Pipeline, models: true do context 'when listing manual actions' do let(:yaml) do { - stages: ["build", "test", "test_failure", "deploy", "cleanup"], + stages: ["build", "test", "staging", "production", "cleanup"], build: { stage: "build", script: "BUILD", @@ -273,17 +273,12 @@ describe Ci::Pipeline, models: true do stage: "test", script: "TEST", }, - test_failure: { - stage: "test_failure", - script: "ON test failure", - when: "on_failure", - }, - deploy: { - stage: "deploy", + staging: { + stage: "staging", script: "PUBLISH", }, production: { - stage: "deploy", + stage: "production", script: "PUBLISH", when: "manual", }, @@ -311,11 +306,18 @@ describe Ci::Pipeline, models: true do # succeed stage test pipeline.builds.running_or_pending.each(&:success) - expect(manual_actions).to be_one # production + expect(manual_actions).to be_empty - # succeed stage deploy + # succeed stage staging and skip stage production pipeline.builds.running_or_pending.each(&:success) expect(manual_actions).to be_many # production and clear cache + + # succeed stage cleanup + pipeline.builds.running_or_pending.each(&:success) + + # after processing a pipeline we should have 6 builds, 5 succeeded + expect(pipeline.builds.count).to eq(6) + expect(pipeline.builds.success.count).to eq(4) end def manual_actions |