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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b1af1f26
Commit
b1af1f26
authored
Aug 31, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix enum wording
parent
dcf09d11
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
app/models/commit_status.rb
app/models/commit_status.rb
+1
-1
app/services/projects/update_pages_service.rb
app/services/projects/update_pages_service.rb
+1
-1
app/workers/stuck_ci_jobs_worker.rb
app/workers/stuck_ci_jobs_worker.rb
+1
-1
lib/api/commit_statuses.rb
lib/api/commit_statuses.rb
+1
-1
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+1
-1
No files found.
app/models/commit_status.rb
View file @
b1af1f26
...
@@ -43,7 +43,7 @@ class CommitStatus < ActiveRecord::Base
...
@@ -43,7 +43,7 @@ class CommitStatus < ActiveRecord::Base
failed_by_script:
1
,
# TODO: Not used. Should we expand pipeline as well?
failed_by_script:
1
,
# TODO: Not used. Should we expand pipeline as well?
failed_by_missing_dependency:
2
,
# This will be done in the next MR.
failed_by_missing_dependency:
2
,
# This will be done in the next MR.
failed_by_system:
3
,
# TODO: Not used. What's this state?
failed_by_system:
3
,
# TODO: Not used. What's this state?
failed_by_
failed_
job_state:
4
,
failed_by_job_state:
4
,
failed_by_out_of_quota:
5
,
# TODO: Only EE. How can we detect?
failed_by_out_of_quota:
5
,
# TODO: Only EE. How can we detect?
failed_by_stuck_and_timeout:
6
,
failed_by_stuck_and_timeout:
6
,
failed_by_no_runner:
7
,
# TODO: Not used. How can we detect?
failed_by_no_runner:
7
,
# TODO: Not used. How can we detect?
...
...
app/services/projects/update_pages_service.rb
View file @
b1af1f26
...
@@ -53,7 +53,7 @@ module Projects
...
@@ -53,7 +53,7 @@ module Projects
log_error
(
"Projects::UpdatePagesService:
#{
message
}
"
)
log_error
(
"Projects::UpdatePagesService:
#{
message
}
"
)
@status
.
allow_failure
=
!
latest?
@status
.
allow_failure
=
!
latest?
@status
.
description
=
message
@status
.
description
=
message
@status
.
drop
(
:page
)
@status
.
drop
(
:
failed_by_
page
)
super
super
end
end
...
...
app/workers/stuck_ci_jobs_worker.rb
View file @
b1af1f26
...
@@ -53,7 +53,7 @@ class StuckCiJobsWorker
...
@@ -53,7 +53,7 @@ class StuckCiJobsWorker
def
drop_build
(
type
,
build
,
status
,
timeout
)
def
drop_build
(
type
,
build
,
status
,
timeout
)
Rails
.
logger
.
info
"
#{
self
.
class
}
: Dropping
#{
type
}
build
#{
build
.
id
}
for runner
#{
build
.
runner_id
}
(status:
#{
status
}
, timeout:
#{
timeout
}
)"
Rails
.
logger
.
info
"
#{
self
.
class
}
: Dropping
#{
type
}
build
#{
build
.
id
}
for runner
#{
build
.
runner_id
}
(status:
#{
status
}
, timeout:
#{
timeout
}
)"
Gitlab
::
OptimisticLocking
.
retry_lock
(
build
,
3
)
do
|
b
|
Gitlab
::
OptimisticLocking
.
retry_lock
(
build
,
3
)
do
|
b
|
b
.
drop
(
:stuck_and_timeout
)
b
.
drop
(
:
failed_by_
stuck_and_timeout
)
end
end
end
end
end
end
lib/api/commit_statuses.rb
View file @
b1af1f26
...
@@ -103,7 +103,7 @@ module API
...
@@ -103,7 +103,7 @@ module API
when
'success'
when
'success'
status
.
success!
status
.
success!
when
'failed'
when
'failed'
status
.
drop!
(
:api
)
status
.
drop!
(
:
failed_by_
api
)
when
'canceled'
when
'canceled'
status
.
cancel!
status
.
cancel!
else
else
...
...
spec/requests/api/runner_spec.rb
View file @
b1af1f26
...
@@ -634,7 +634,7 @@ describe API::Runner do
...
@@ -634,7 +634,7 @@ describe API::Runner do
update_job
(
state:
'failed'
)
update_job
(
state:
'failed'
)
expect
(
job
.
reload
.
status
).
to
eq
'failed'
expect
(
job
.
reload
.
status
).
to
eq
'failed'
expect
(
job
).
to
be_failed_by_
failed_
job_state
expect
(
job
).
to
be_failed_by_job_state
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