Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9f639b07
Commit
9f639b07
authored
Oct 02, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set a pipeline failure reason when it has YAML errors
Conflicts: app/models/ci/pipeline.rb
parent
41d8030e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+2
-1
lib/gitlab/ci/pipeline/chain/validate/config.rb
lib/gitlab/ci/pipeline/chain/validate/config.rb
+1
-1
spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb
spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb
+4
-0
No files found.
app/models/ci/pipeline.rb
View file @
9f639b07
...
@@ -59,7 +59,8 @@ module Ci
...
@@ -59,7 +59,8 @@ module Ci
}
}
enum
failure_reason:
{
enum
failure_reason:
{
unknown_failure:
0
unknown_failure:
0
,
config_error:
1
}
}
state_machine
:status
,
initial: :created
do
state_machine
:status
,
initial: :created
do
...
...
lib/gitlab/ci/pipeline/chain/validate/config.rb
View file @
9f639b07
...
@@ -13,7 +13,7 @@ module Gitlab
...
@@ -13,7 +13,7 @@ module Gitlab
end
end
if
@command
.
save_incompleted
&&
@pipeline
.
has_yaml_errors?
if
@command
.
save_incompleted
&&
@pipeline
.
has_yaml_errors?
@pipeline
.
drop
@pipeline
.
drop
!
(
:config_error
)
end
end
return
error
(
@pipeline
.
yaml_errors
)
return
error
(
@pipeline
.
yaml_errors
)
...
...
spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb
View file @
9f639b07
...
@@ -55,6 +55,10 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
...
@@ -55,6 +55,10 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
it
'fails the pipeline'
do
it
'fails the pipeline'
do
expect
(
pipeline
.
reload
).
to
be_failed
expect
(
pipeline
.
reload
).
to
be_failed
end
end
it
'sets a config error failure reason'
do
expect
(
pipeline
.
reload
.
config_error?
).
to
eq
true
end
end
end
context
'when saving incomplete pipeline is not allowed'
do
context
'when saving incomplete pipeline is not allowed'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment