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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
54263dc1
Commit
54263dc1
authored
Sep 28, 2018
by
Shinya Maeda
Committed by
Alessio Caiazza
Oct 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix coding style offence
parent
b5a591d8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
11 deletions
+15
-11
app/services/ci/process_build_service.rb
app/services/ci/process_build_service.rb
+1
-0
lib/gitlab/ci/status/build/failed.rb
lib/gitlab/ci/status/build/failed.rb
+1
-1
spec/services/ci/process_pipeline_service_spec.rb
spec/services/ci/process_pipeline_service_spec.rb
+12
-9
spec/workers/ci/build_schedule_worker_spec.rb
spec/workers/ci/build_schedule_worker_spec.rb
+1
-1
No files found.
app/services/ci/process_build_service.rb
View file @
54263dc1
...
...
@@ -11,6 +11,7 @@ module Ci
else
build
.
enqueue
end
true
else
build
.
skip
...
...
lib/gitlab/ci/status/build/failed.rb
View file @
54263dc1
...
...
@@ -11,7 +11,7 @@ module Gitlab
runner_system_failure:
'runner system failure'
,
missing_dependency_failure:
'missing dependency failure'
,
runner_unsupported:
'unsupported runner'
,
schedule_expired:
'schedule expired'
,
schedule_expired:
'schedule expired'
}.
freeze
private_constant
:REASONS
...
...
spec/services/ci/process_pipeline_service_spec.rb
View file @
54263dc1
...
...
@@ -257,7 +257,7 @@ describe Ci::ProcessPipelineService, '#execute' do
it
'properly processes the pipeline'
do
expect
(
process_pipeline
).
to
be_truthy
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'pending'
})
succeed_pending
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'success'
,
'rollout10%'
:
'scheduled'
})
...
...
@@ -283,7 +283,7 @@ describe Ci::ProcessPipelineService, '#execute' do
it
'properly processes the pipeline'
do
expect
(
process_pipeline
).
to
be_truthy
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'pending'
})
fail_running_or_pending
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'failed'
})
...
...
@@ -295,11 +295,11 @@ describe Ci::ProcessPipelineService, '#execute' do
it
'properly processes the pipeline'
do
expect
(
process_pipeline
).
to
be_truthy
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'pending'
})
succeed_pending
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'success'
,
'rollout10%'
:
'scheduled'
})
unschedule
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'success'
,
'rollout10%'
:
'manual'
})
...
...
@@ -324,11 +324,11 @@ describe Ci::ProcessPipelineService, '#execute' do
it
'properly processes the pipeline'
do
expect
(
process_pipeline
).
to
be_truthy
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'pending'
})
succeed_pending
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'success'
,
'rollout10%'
:
'scheduled'
})
enqueue_scheduled
(
'rollout10%'
)
fail_running_or_pending
...
...
@@ -354,11 +354,11 @@ describe Ci::ProcessPipelineService, '#execute' do
it
'properly processes the pipeline'
do
expect
(
process_pipeline
).
to
be_truthy
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'pending'
})
succeed_pending
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'success'
,
'rollout10%'
:
'scheduled'
})
play_manual_action
(
'rollout10%'
)
expect
(
builds_names_and_statuses
).
to
eq
({
'build'
:
'success'
,
'rollout10%'
:
'pending'
})
...
...
@@ -718,7 +718,10 @@ describe Ci::ProcessPipelineService, '#execute' do
end
def
builds_names_and_statuses
builds
.
inject
({})
{
|
h
,
b
|
h
[
b
.
name
.
to_sym
]
=
b
.
status
;
h
}
builds
.
each_with_object
({})
do
|
h
,
b
|
h
[
b
.
name
.
to_sym
]
=
b
.
status
h
end
end
def
all_builds_names
...
...
spec/workers/ci/build_schedule_worker_spec.rb
View file @
54263dc1
...
...
@@ -10,7 +10,7 @@ describe Ci::BuildScheduleWorker do
it
'executes RunScheduledBuildService'
do
expect_any_instance_of
(
Ci
::
RunScheduledBuildService
)
.
to
receive
(
:execute
).
once
subject
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