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
07af37a2
Commit
07af37a2
authored
Jun 02, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not create pipeline objects when no builds
parent
53fe06ef
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
11 deletions
+22
-11
create_builds_service.rb
app/services/ci/create_builds_service.rb
+12
-5
create_commit_builds_service.rb
app/services/create_commit_builds_service.rb
+5
-5
create_builds_service_spec.rb
spec/services/ci/create_builds_service_spec.rb
+5
-1
No files found.
app/services/ci/create_builds_service.rb
View file @
07af37a2
...
@@ -20,10 +20,14 @@ module Ci
...
@@ -20,10 +20,14 @@ module Ci
end
end
end
end
builds_attrs
.
map
do
|
build_attrs
|
# don't create the same build twice
# don't create the same build twice
unless
@commit
.
builds
.
find_by
(
ref:
@commit
.
ref
,
tag:
@commit
.
tag
,
builds_attrs
.
reject!
do
|
build_attrs
|
trigger_request:
trigger_request
,
name:
build_attrs
[
:name
])
@commit
.
builds
.
find_by
(
ref:
@commit
.
ref
,
tag:
@commit
.
tag
,
trigger_request:
trigger_request
,
name:
build_attrs
[
:name
])
end
builds_attrs
.
map
do
|
build_attrs
|
build_attrs
.
slice!
(
:name
,
build_attrs
.
slice!
(
:name
,
:commands
,
:commands
,
:tag_list
,
:tag_list
,
...
@@ -38,8 +42,11 @@ module Ci
...
@@ -38,8 +42,11 @@ module Ci
user:
user
,
user:
user
,
project:
@commit
.
project
)
project:
@commit
.
project
)
@commit
.
builds
.
create!
(
build_attrs
)
##
end
# We do not persist new builds here.
# Those will be persisted when @commit is saved.
#
@commit
.
builds
.
new
(
build_attrs
)
end
end
end
end
end
end
...
...
app/services/create_commit_builds_service.rb
View file @
07af37a2
...
@@ -25,16 +25,16 @@ class CreateCommitBuildsService
...
@@ -25,16 +25,16 @@ class CreateCommitBuildsService
return
false
return
false
end
end
# Create a new ci_commit
commit
.
save!
# Skip creating builds for commits that have [ci skip]
# Skip creating builds for commits that have [ci skip]
unless
commit
.
skip_ci?
unless
commit
.
skip_ci?
# Create builds for commit
# Create builds for commit and
commit
.
create_builds
(
user
)
# skip saving pipeline when there are no builds
return
false
unless
commit
.
create_builds
(
user
)
end
end
commit
.
update_state!
# Create a new ci_commit
commit
.
save!
commit
commit
end
end
end
end
spec/services/ci/create_builds_service_spec.rb
View file @
07af37a2
...
@@ -9,7 +9,7 @@ describe Ci::CreateBuildsService, services: true do
...
@@ -9,7 +9,7 @@ describe Ci::CreateBuildsService, services: true do
#
#
subject
do
subject
do
described_class
.
new
(
commit
).
execute
(
commit
,
nil
,
user
,
status
)
described_class
.
new
(
commit
).
execute
(
'test'
,
user
,
status
,
nil
)
end
end
context
'next builds available'
do
context
'next builds available'
do
...
@@ -17,6 +17,10 @@ describe Ci::CreateBuildsService, services: true do
...
@@ -17,6 +17,10 @@ describe Ci::CreateBuildsService, services: true do
it
{
is_expected
.
to
be_an_instance_of
Array
}
it
{
is_expected
.
to
be_an_instance_of
Array
}
it
{
is_expected
.
to
all
(
be_an_instance_of
Ci
::
Build
)
}
it
{
is_expected
.
to
all
(
be_an_instance_of
Ci
::
Build
)
}
it
'does not persist created builds'
do
expect
(
subject
.
first
).
not_to
be_persisted
end
end
end
context
'builds skipped'
do
context
'builds skipped'
do
...
...
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