Commit 6c339026 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix a problem with processing a pipeline where stage only has manual actions

parent 30f375cf
...@@ -212,8 +212,9 @@ module Ci ...@@ -212,8 +212,9 @@ module Ci
# build builds only for the first stage that has builds available. # build builds only for the first stage that has builds available.
# #
stages.any? do |stage| stages.any? do |stage|
CreateBuildsService.new(self) CreateBuildsService.new(self).
.execute(stage, user, status, trigger_request).present? execute(stage, user, status, trigger_request).
any?(&:active?)
end end
end end
......
...@@ -264,7 +264,7 @@ describe Ci::Pipeline, models: true do ...@@ -264,7 +264,7 @@ describe Ci::Pipeline, models: true do
context 'when listing manual actions' do context 'when listing manual actions' do
let(:yaml) do let(:yaml) do
{ {
stages: ["build", "test", "test_failure", "deploy", "cleanup"], stages: ["build", "test", "staging", "production", "cleanup"],
build: { build: {
stage: "build", stage: "build",
script: "BUILD", script: "BUILD",
...@@ -273,17 +273,12 @@ describe Ci::Pipeline, models: true do ...@@ -273,17 +273,12 @@ describe Ci::Pipeline, models: true do
stage: "test", stage: "test",
script: "TEST", script: "TEST",
}, },
test_failure: { staging: {
stage: "test_failure", stage: "staging",
script: "ON test failure",
when: "on_failure",
},
deploy: {
stage: "deploy",
script: "PUBLISH", script: "PUBLISH",
}, },
production: { production: {
stage: "deploy", stage: "production",
script: "PUBLISH", script: "PUBLISH",
when: "manual", when: "manual",
}, },
...@@ -311,11 +306,18 @@ describe Ci::Pipeline, models: true do ...@@ -311,11 +306,18 @@ describe Ci::Pipeline, models: true do
# succeed stage test # succeed stage test
pipeline.builds.running_or_pending.each(&:success) 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) pipeline.builds.running_or_pending.each(&:success)
expect(manual_actions).to be_many # production and clear cache 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 end
def manual_actions def manual_actions
......
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