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
db33021d
Commit
db33021d
authored
Jan 23, 2019
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it clear that pipeline can process processables
parent
8850da27
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
app/services/ci/process_pipeline_service.rb
app/services/ci/process_pipeline_service.rb
+7
-7
No files found.
app/services/ci/process_pipeline_service.rb
View file @
db33021d
...
...
@@ -10,7 +10,7 @@ module Ci
update_retried
new_builds
=
stage_indexes_of_created_
build
s
.
map
do
|
index
|
stage_indexes_of_created_
processable
s
.
map
do
|
index
|
process_stage
(
index
)
end
...
...
@@ -27,7 +27,7 @@ module Ci
return
if
HasStatus
::
BLOCKED_STATUS
.
include?
(
current_status
)
if
HasStatus
::
COMPLETED_STATUSES
.
include?
(
current_status
)
created_
build
s_in_stage
(
index
).
select
do
|
build
|
created_
processable
s_in_stage
(
index
).
select
do
|
build
|
Gitlab
::
OptimisticLocking
.
retry_lock
(
build
)
do
|
subject
|
Ci
::
ProcessBuildService
.
new
(
project
,
@user
)
.
execute
(
build
,
current_status
)
...
...
@@ -43,18 +43,18 @@ module Ci
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
stage_indexes_of_created_
build
s
created_
build
s
.
order
(
:stage_idx
).
pluck
(
'distinct stage_idx'
)
def
stage_indexes_of_created_
processable
s
created_
processable
s
.
order
(
:stage_idx
).
pluck
(
'distinct stage_idx'
)
end
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
created_
build
s_in_stage
(
index
)
created_
build
s
.
where
(
stage_idx:
index
)
def
created_
processable
s_in_stage
(
index
)
created_
processable
s
.
where
(
stage_idx:
index
)
end
# rubocop: enable CodeReuse/ActiveRecord
def
created_
build
s
def
created_
processable
s
pipeline
.
processables
.
created
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