BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
64e09a1b
Commit
64e09a1b
authored
May 08, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipeline status when allowed to fail jobs present
parent
bf57a7e8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
has_status.rb
app/models/concerns/has_status.rb
+3
-1
process_pipeline_service_spec.rb
spec/services/ci/process_pipeline_service_spec.rb
+4
-0
No files found.
app/models/concerns/has_status.rb
View file @
64e09a1b
...
@@ -37,7 +37,9 @@ module HasStatus
...
@@ -37,7 +37,9 @@ module HasStatus
end
end
def
status
def
status
all
.
pluck
(
status_sql
).
first
all
.
pluck
(
status_sql
).
first
.
tap
do
|
status
|
return
'success'
if
status
==
'skipped'
&&
all
.
failed_but_allowed
.
any?
end
end
end
def
started_at
def
started_at
...
...
spec/services/ci/process_pipeline_service_spec.rb
View file @
64e09a1b
...
@@ -62,6 +62,10 @@ describe Ci::ProcessPipelineService, '#execute', :services do
...
@@ -62,6 +62,10 @@ describe Ci::ProcessPipelineService, '#execute', :services do
fail_running_or_pending
fail_running_or_pending
expect
(
builds_statuses
).
to
eq
%w(failed pending)
expect
(
builds_statuses
).
to
eq
%w(failed pending)
fail_running_or_pending
expect
(
pipeline
.
reload
).
to
be_success
end
end
end
end
...
...
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