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
47f007d6
Commit
47f007d6
authored
8 years ago
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack
parents
a391652f
283b2c0b
No related merge requests found
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
34 deletions
+39
-34
app/models/ci/build.rb
app/models/ci/build.rb
+2
-2
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+8
-14
app/models/commit_status.rb
app/models/commit_status.rb
+1
-1
app/models/spam_report.rb
app/models/spam_report.rb
+0
-5
app/services/ci/process_pipeline_service.rb
app/services/ci/process_pipeline_service.rb
+1
-1
doc/development/performance.md
doc/development/performance.md
+4
-5
spec/models/build_spec.rb
spec/models/build_spec.rb
+4
-2
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+19
-4
No files found.
app/models/ci/build.rb
View file @
47f007d6
...
...
@@ -59,7 +59,7 @@ module Ci
when:
build
.
when
,
user:
user
,
environment:
build
.
environment
,
status_event:
'queue'
status_event:
'
en
queue'
)
MergeRequests
::
AddTodoWhenBuildFailsService
.
new
(
build
.
project
,
nil
).
close
(
new_build
)
new_build
...
...
@@ -102,7 +102,7 @@ module Ci
def
play
(
current_user
=
nil
)
# Try to queue a current build
if
self
.
queue
if
self
.
en
queue
self
.
update
(
user:
current_user
)
self
else
...
...
This diff is collapsed.
Click to expand it.
app/models/ci/pipeline.rb
View file @
47f007d6
...
...
@@ -22,9 +22,9 @@ module Ci
delegate
:stages
,
to: :statuses
state_machine
:status
,
initial: :created
do
event
:queue
do
event
:
en
queue
do
transition
created: :pending
transition
any
-
[
:created
,
:pending
]
=>
:running
transition
[
:success
,
:failed
,
:canceled
,
:skipped
]
=>
:running
end
event
:run
do
...
...
@@ -230,18 +230,12 @@ module Ci
def
build_updated
case
latest_builds_status
when
'pending'
queue
when
'running'
run
when
'success'
succeed
when
'failed'
drop
when
'canceled'
cancel
when
'skipped'
skip
when
'pending'
then
enqueue
when
'running'
then
run
when
'success'
then
succeed
when
'failed'
then
drop
when
'canceled'
then
cancel
when
'skipped'
then
skip
end
end
...
...
This diff is collapsed.
Click to expand it.
app/models/commit_status.rb
View file @
47f007d6
...
...
@@ -26,7 +26,7 @@ class CommitStatus < ActiveRecord::Base
scope
:ignored
,
->
{
where
(
allow_failure:
true
,
status:
[
:failed
,
:canceled
])
}
state_machine
:status
do
event
:queue
do
event
:
en
queue
do
transition
[
:created
,
:skipped
]
=>
:pending
end
...
...
This diff is collapsed.
Click to expand it.
app/models/spam_report.rb
deleted
100644 → 0
View file @
a391652f
class
SpamReport
<
ActiveRecord
::
Base
belongs_to
:user
validates
:user
,
presence:
true
end
This diff is collapsed.
Click to expand it.
app/services/ci/process_pipeline_service.rb
View file @
47f007d6
...
...
@@ -37,7 +37,7 @@ module Ci
return
false
unless
Statuseable
::
COMPLETED_STATUSES
.
include?
(
current_status
)
if
valid_statuses_for_when
(
build
.
when
).
include?
(
current_status
)
build
.
queue
build
.
en
queue
true
else
build
.
skip
...
...
This diff is collapsed.
Click to expand it.
doc/development/performance.md
View file @
47f007d6
...
...
@@ -15,8 +15,8 @@ The process of solving performance problems is roughly as follows:
3.
Add your findings based on the measurement period (screenshots of graphs,
timings, etc) to the issue mentioned in step 1.
4.
Solve the problem.
5.
Create a merge request, assign the "
performance" label and ping the right
people (e.g.
[
@yorickpeterse
][
yorickpeterse
]
and
[
@joshfng
][
joshfng
]
)
.
5.
Create a merge request, assign the "
Performance" label and assign it to
[
@yorickpeterse
][
yorickpeterse
]
for reviewing
.
6.
Once a change has been deployed make sure to _again_ measure for at least 24
hours to see if your changes have any impact on the production environment.
7.
Repeat until you're done.
...
...
@@ -36,8 +36,8 @@ graphs/dashboards.
GitLab provides two built-in tools to aid the process of improving performance:
*
[
Sherlock
](
doc/development/
profiling.md#sherlock
)
*
[
GitLab Performance Monitoring
](
doc
/monitoring/performance/monitoring.md
)
*
[
Sherlock
](
profiling.md#sherlock
)
*
[
GitLab Performance Monitoring
](
..
/monitoring/performance/monitoring.md
)
GitLab employees can use GitLab.com's performance monitoring systems located at
<http://performance.gitlab.net>
, this requires you to log in using your
...
...
@@ -254,5 +254,4 @@ referencing an object directly may even slow code down.
[
#15607
]:
https://gitlab.com/gitlab-org/gitlab-ce/issues/15607
[
yorickpeterse
]:
https://gitlab.com/u/yorickpeterse
[
joshfng
]:
https://gitlab.com/u/joshfng
[
anti-pattern
]:
https://en.wikipedia.org/wiki/Anti-pattern
This diff is collapsed.
Click to expand it.
spec/models/build_spec.rb
View file @
47f007d6
...
...
@@ -887,8 +887,10 @@ describe Ci::Build, models: true do
is_expected
.
to
eq
(
build
)
end
context
'for success build'
do
before
{
build
.
queue
}
context
'for successful build'
do
before
do
build
.
update
(
status:
'success'
)
end
it
'creates a new build'
do
is_expected
.
to
be_pending
...
...
This diff is collapsed.
Click to expand it.
spec/models/ci/pipeline_spec.rb
View file @
47f007d6
...
...
@@ -145,7 +145,7 @@ describe Ci::Pipeline, models: true do
expect
(
pipeline
.
reload
.
started_at
).
not_to
be_nil
end
it
'do not update on transitioning to success'
do
it
'do
es
not update on transitioning to success'
do
build
.
success
expect
(
pipeline
.
reload
.
started_at
).
to
be_nil
...
...
@@ -159,7 +159,7 @@ describe Ci::Pipeline, models: true do
expect
(
pipeline
.
reload
.
finished_at
).
not_to
be_nil
end
it
'do not update on transitioning to running'
do
it
'do
es
not update on transitioning to running'
do
build
.
run
expect
(
pipeline
.
reload
.
finished_at
).
to
be_nil
...
...
@@ -259,14 +259,16 @@ describe Ci::Pipeline, models: true do
subject
{
pipeline
.
reload
.
status
}
context
'on queuing'
do
before
{
build
.
queue
}
before
do
build
.
enqueue
end
it
{
is_expected
.
to
eq
(
'pending'
)
}
end
context
'on run'
do
before
do
build
.
queue
build
.
en
queue
build
.
run
end
...
...
@@ -296,6 +298,19 @@ describe Ci::Pipeline, models: true do
it
{
is_expected
.
to
eq
(
'canceled'
)
}
end
context
'on failure and build retry'
do
before
do
build
.
drop
Ci
::
Build
.
retry
(
build
)
end
# We are changing a state: created > failed > running
# Instead of: created > failed > pending
# Since the pipeline already run, so it should not be pending anymore
it
{
is_expected
.
to
eq
(
'running'
)
}
end
end
describe
'#execute_hooks'
do
...
...
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