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
953e590b
Commit
953e590b
authored
Feb 16, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make build clone/retry implementation more robust
parent
658c5f32
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
36 deletions
+53
-36
app/services/ci/retry_build_service.rb
app/services/ci/retry_build_service.rb
+20
-18
features/steps/shared/builds.rb
features/steps/shared/builds.rb
+1
-1
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+12
-1
spec/services/ci/retry_build_service_spec.rb
spec/services/ci/retry_build_service_spec.rb
+20
-16
No files found.
app/services/ci/retry_build_service.rb
View file @
953e590b
module
Ci
module
Ci
class
RetryBuildService
<
::
BaseService
class
RetryBuildService
<
::
BaseService
CLONE_ATTRIBUTES
=
%i[pipeline ref tag options commands tag_list name
allow_failure stage stage_idx trigger_request
yaml_variables when environment coverage_regex]
.
freeze
REJECT_ATTRIBUTES
=
%i[id status user token coverage trace runner
artifacts_file artifacts_metadata artifacts_size
created_at updated_at started_at finished_at
queued_at erased_by erased_at]
.
freeze
IGNORE_ATTRIBUTES
=
%i[trace type lock_version project target_url
deploy job_id description]
.
freeze
def
execute
(
build
)
def
execute
(
build
)
reprocess
(
build
).
tap
do
|
new_build
|
reprocess
(
build
).
tap
do
|
new_build
|
build
.
pipeline
.
mark_as_processable_after_stage
(
build
.
stage_idx
)
build
.
pipeline
.
mark_as_processable_after_stage
(
build
.
stage_idx
)
...
@@ -17,24 +30,13 @@ module Ci
...
@@ -17,24 +30,13 @@ module Ci
raise
Gitlab
::
Access
::
AccessDeniedError
raise
Gitlab
::
Access
::
AccessDeniedError
end
end
Ci
::
Build
.
create
(
attributes
=
CLONE_ATTRIBUTES
.
map
do
|
attribute
|
ref:
build
.
ref
,
[
attribute
,
build
.
send
(
attribute
)]
tag:
build
.
tag
,
end
options:
build
.
options
,
commands:
build
.
commands
,
attributes
.
push
([
:user
,
current_user
])
tag_list:
build
.
tag_list
,
project:
build
.
project
,
project
.
builds
.
create
(
Hash
[
attributes
])
pipeline:
build
.
pipeline
,
name:
build
.
name
,
allow_failure:
build
.
allow_failure
,
stage:
build
.
stage
,
stage_idx:
build
.
stage_idx
,
trigger_request:
build
.
trigger_request
,
yaml_variables:
build
.
yaml_variables
,
when:
build
.
when
,
environment:
build
.
environment
,
coverage_regex:
build
.
coverage_regex
,
user:
current_user
)
end
end
end
end
end
end
features/steps/shared/builds.rb
View file @
953e590b
...
@@ -11,7 +11,7 @@ module SharedBuilds
...
@@ -11,7 +11,7 @@ module SharedBuilds
step
'project has a recent build'
do
step
'project has a recent build'
do
@pipeline
=
create
(
:ci_empty_pipeline
,
project:
@project
,
sha:
@project
.
commit
.
sha
,
ref:
'master'
)
@pipeline
=
create
(
:ci_empty_pipeline
,
project:
@project
,
sha:
@project
.
commit
.
sha
,
ref:
'master'
)
@build
=
create
(
:ci_build
_with_
coverage
,
pipeline:
@pipeline
)
@build
=
create
(
:ci_build
,
:
coverage
,
pipeline:
@pipeline
)
end
end
step
'recent build is successful'
do
step
'recent build is successful'
do
...
...
spec/factories/ci/builds.rb
View file @
953e590b
...
@@ -89,8 +89,9 @@ FactoryGirl.define do
...
@@ -89,8 +89,9 @@ FactoryGirl.define do
tag
true
tag
true
end
end
factory
:ci_build_with_
coverage
do
trait
:
coverage
do
coverage
99.9
coverage
99.9
coverage_regex
'/(d+)/'
end
end
trait
:trace
do
trait
:trace
do
...
@@ -99,6 +100,16 @@ FactoryGirl.define do
...
@@ -99,6 +100,16 @@ FactoryGirl.define do
end
end
end
end
trait
:erased
do
erased_at
Time
.
now
erased_by
factory: :user
end
trait
:queued
do
queued_at
Time
.
now
runner
factory: :ci_runner
end
trait
:artifacts
do
trait
:artifacts
do
after
(
:create
)
do
|
build
,
_
|
after
(
:create
)
do
|
build
,
_
|
build
.
artifacts_file
=
build
.
artifacts_file
=
...
...
spec/services/ci/retry_build_service_spec.rb
View file @
953e590b
...
@@ -12,29 +12,33 @@ describe Ci::RetryBuildService, :services do
...
@@ -12,29 +12,33 @@ describe Ci::RetryBuildService, :services do
shared_examples
'build duplication'
do
shared_examples
'build duplication'
do
let
(
:build
)
do
let
(
:build
)
do
create
(
:ci_build
,
:failed
,
:artifacts
,
create
(
:ci_build
,
:failed
,
:artifacts
,
:erased
,
:trace
,
pipeline:
pipeline
,
:queued
,
:coverage
,
pipeline:
pipeline
)
coverage:
90.0
,
coverage_regex:
'/(d+)/'
)
end
end
it
'clones expected attributes'
do
describe
'clone attributes'
do
clone_attributes
=
%w[ref tag project pipeline options commands tag_list
described_class
::
CLONE_ATTRIBUTES
.
each
do
|
attribute
|
name allow_failure stage stage_idx trigger_request
it
"clones
#{
attribute
}
build attribute"
do
yaml_variables when environment coverage_regex]
expect
(
new_build
.
send
(
attribute
)).
to
eq
build
.
send
(
attribute
)
end
end
end
clone_attributes
.
each
do
|
attribute
|
describe
'reject attributes'
do
expect
(
new_build
.
send
(
attribute
)).
to
eq
build
.
send
(
attribute
)
described_class
::
REJECT_ATTRIBUTES
.
each
do
|
attribute
|
it
"does not clone
#{
attribute
}
build attribute"
do
expect
(
new_build
.
send
(
attribute
)).
not_to
eq
build
.
send
(
attribute
)
end
end
end
end
end
it
'does not clone forbidden attributes'
do
it
'has correct number of known attributes'
do
forbidden_attributes
=
%w[id status token user artifacts_file
attributes
=
artifacts_metadata coverage]
described_class
::
CLONE_ATTRIBUTES
+
described_class
::
IGNORE_ATTRIBUTES
+
described_class
::
REJECT_ATTRIBUTES
forbidden_attributes
.
each
do
|
attribute
|
expect
(
attributes
.
size
).
to
eq
build
.
attributes
.
size
expect
(
new_build
.
send
(
attribute
)).
not_to
eq
build
.
send
(
attribute
)
end
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