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
Léo-Paul Géneau
gitlab-ce
Commits
4611a599
Commit
4611a599
authored
Oct 28, 2018
by
Shinya Maeda
Committed by
Kamil Trzciński
Oct 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add failure reason for execution timeout
parent
8a116be4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
3 deletions
+20
-3
app/models/commit_status.rb
app/models/commit_status.rb
+2
-1
app/presenters/commit_status_presenter.rb
app/presenters/commit_status_presenter.rb
+2
-1
changelogs/unreleased/add-failure-reason-for-execution-timeout.yml
...s/unreleased/add-failure-reason-for-execution-timeout.yml
+5
-0
lib/gitlab/ci/status/build/failed.rb
lib/gitlab/ci/status/build/failed.rb
+2
-1
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+9
-0
No files found.
app/models/commit_status.rb
View file @
4611a599
...
@@ -50,7 +50,8 @@ class CommitStatus < ActiveRecord::Base
...
@@ -50,7 +50,8 @@ class CommitStatus < ActiveRecord::Base
runner_system_failure:
4
,
runner_system_failure:
4
,
missing_dependency_failure:
5
,
missing_dependency_failure:
5
,
runner_unsupported:
6
,
runner_unsupported:
6
,
stale_schedule:
7
stale_schedule:
7
,
job_execution_timeout:
8
}
}
##
##
...
...
app/presenters/commit_status_presenter.rb
View file @
4611a599
...
@@ -9,7 +9,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
...
@@ -9,7 +9,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
runner_system_failure:
'There has been a runner system failure, please try again'
,
runner_system_failure:
'There has been a runner system failure, please try again'
,
missing_dependency_failure:
'There has been a missing dependency failure'
,
missing_dependency_failure:
'There has been a missing dependency failure'
,
runner_unsupported:
'Your runner is outdated, please upgrade your runner'
,
runner_unsupported:
'Your runner is outdated, please upgrade your runner'
,
stale_schedule:
'Delayed job could not be executed by some reason, please try again'
stale_schedule:
'Delayed job could not be executed by some reason, please try again'
,
job_execution_timeout:
'The script exceeded the maximum execution time set for the job'
}.
freeze
}.
freeze
private_constant
:CALLOUT_FAILURE_MESSAGES
private_constant
:CALLOUT_FAILURE_MESSAGES
...
...
changelogs/unreleased/add-failure-reason-for-execution-timeout.yml
0 → 100644
View file @
4611a599
---
title
:
Add failure reason for execution timeout
merge_request
:
22224
author
:
type
:
changed
lib/gitlab/ci/status/build/failed.rb
View file @
4611a599
...
@@ -11,7 +11,8 @@ module Gitlab
...
@@ -11,7 +11,8 @@ module Gitlab
runner_system_failure:
'runner system failure'
,
runner_system_failure:
'runner system failure'
,
missing_dependency_failure:
'missing dependency failure'
,
missing_dependency_failure:
'missing dependency failure'
,
runner_unsupported:
'unsupported runner'
,
runner_unsupported:
'unsupported runner'
,
stale_schedule:
'stale schedule'
stale_schedule:
'stale schedule'
,
job_execution_timeout:
'job execution timeout'
}.
freeze
}.
freeze
private_constant
:REASONS
private_constant
:REASONS
...
...
spec/requests/api/runner_spec.rb
View file @
4611a599
...
@@ -806,6 +806,15 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
...
@@ -806,6 +806,15 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
it
{
expect
(
job
).
to
be_unknown_failure
}
it
{
expect
(
job
).
to
be_unknown_failure
}
end
end
context
'when failure_reason is job_execution_timeout'
do
before
do
update_job
(
state:
'failed'
,
failure_reason:
'job_execution_timeout'
)
job
.
reload
end
it
{
expect
(
job
).
to
be_job_execution_timeout
}
end
end
end
context
'when trace is given'
do
context
'when trace is given'
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