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
iv
gitlab-ce
Commits
2d495fce
Commit
2d495fce
authored
8 years ago
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove reduntant method for building pipeline builds
parent
69112072
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
9 deletions
+12
-9
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+5
-7
app/services/ci/create_builds_service.rb
app/services/ci/create_builds_service.rb
+2
-1
app/services/create_commit_builds_service.rb
app/services/create_commit_builds_service.rb
+1
-1
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+3
-0
spec/services/create_commit_builds_service_spec.rb
spec/services/create_commit_builds_service_spec.rb
+1
-0
No files found.
app/models/ci/pipeline.rb
View file @
2d495fce
...
...
@@ -91,15 +91,14 @@ module Ci
trigger_requests
.
any?
end
def
build_builds
(
user
,
trigger_request
=
nil
)
def
create_builds
(
user
,
trigger_request
=
nil
)
##
# We persist pipeline only if there are builds available
#
return
unless
config_processor
build_builds_for_stages
(
config_processor
.
stages
,
user
,
'success'
,
trigger_request
)
end
def
create_builds
(
user
,
trigger_request
=
nil
)
build_builds
(
user
,
trigger_request
)
&&
save
'success'
,
trigger_request
)
&&
save
end
def
create_next_builds
(
build
)
...
...
@@ -121,7 +120,6 @@ module Ci
# and save pipeline if we have builds
build_builds_for_stages
(
next_stages
,
build
.
user
,
prior_status
,
build
.
trigger_request
)
&&
save
end
def
retried
...
...
This diff is collapsed.
Click to expand it.
app/services/ci/create_builds_service.rb
View file @
2d495fce
...
...
@@ -22,7 +22,8 @@ module Ci
# don't create the same build twice
builds_attrs
.
reject!
do
|
build_attrs
|
@pipeline
.
builds
.
find_by
(
ref:
@pipeline
.
ref
,
tag:
@pipeline
.
tag
,
@pipeline
.
builds
.
find_by
(
ref:
@pipeline
.
ref
,
tag:
@pipeline
.
tag
,
trigger_request:
trigger_request
,
name:
build_attrs
[
:name
])
end
...
...
This diff is collapsed.
Click to expand it.
app/services/create_commit_builds_service.rb
View file @
2d495fce
...
...
@@ -42,7 +42,7 @@ class CreateCommitBuildsService
##
# Skip creating pipeline object if there are no builds for it.
#
unless
@pipeline
.
build
_builds
(
user
)
unless
@pipeline
.
create
_builds
(
user
)
@pipeline
.
errors
.
add
(
:base
,
'No builds created'
)
return
false
end
...
...
This diff is collapsed.
Click to expand it.
spec/models/ci/pipeline_spec.rb
View file @
2d495fce
...
...
@@ -260,12 +260,15 @@ describe Ci::Pipeline, models: true do
end
context
'when no builds created'
do
let
(
:pipeline
)
{
build
(
:ci_pipeline
)
}
before
do
stub_ci_pipeline_yaml_file
(
YAML
.
dump
(
before_script:
[
'ls'
]))
end
it
'returns false'
do
expect
(
pipeline
.
create_builds
(
nil
)).
to
be_falsey
expect
(
pipeline
).
not_to
be_persisted
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/services/create_commit_builds_service_spec.rb
View file @
2d495fce
...
...
@@ -184,6 +184,7 @@ describe CreateCommitBuildsService, services: true do
before:
'00000000'
,
after:
'31das312'
,
commits:
[{
message:
'some msg'
}])
expect
(
result
).
to
be_falsey
expect
(
Ci
::
Build
.
all
).
to
be_empty
expect
(
Ci
::
Pipeline
.
count
).
to
eq
(
0
)
...
...
This diff is collapsed.
Click to expand it.
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