Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
78a4189e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
78a4189e
编写于
2月 21, 2018
作者:
T
Tomasz Maczukin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Show timeout information on job's page
上级
d633bc81
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
84 addition
and
20 deletion
+84
-20
app/assets/javascripts/jobs/components/sidebar_details_block.vue
...ets/javascripts/jobs/components/sidebar_details_block.vue
+15
-0
app/models/ci/build.rb
app/models/ci/build.rb
+9
-3
app/serializers/build_details_entity.rb
app/serializers/build_details_entity.rb
+5
-0
db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb
...d_used_timeout_and_timeout_source_columns_to_ci_builds.rb
+15
-0
db/schema.rb
db/schema.rb
+2
-0
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+2
-0
spec/models/concerns/chronic_duration_attribute_spec.rb
spec/models/concerns/chronic_duration_attribute_spec.rb
+34
-16
spec/services/ci/retry_build_service_spec.rb
spec/services/ci/retry_build_service_spec.rb
+2
-1
未找到文件。
app/assets/javascripts/jobs/components/sidebar_details_block.vue
浏览文件 @
78a4189e
...
...
@@ -39,6 +39,15 @@
runnerId
()
{
return
`#
${
this
.
job
.
runner
.
id
}
`
;
},
timeout
()
{
let
t
=
`
${
this
.
job
.
timeout
.
value
}
`
;
if
(
this
.
job
.
timeout
.
source
!=
null
)
{
t
+=
` (from
${
this
.
job
.
timeout
.
source
}
)`
;
}
return
t
;
},
renderBlock
()
{
return
this
.
job
.
merge_request
||
this
.
job
.
duration
||
...
...
@@ -114,6 +123,12 @@
title=
"Queued"
:value=
"queued"
/>
<detail-row
class=
"js-job-timeout"
v-if=
"job.timeout"
title=
"Timeout"
:value=
"timeout"
/>
<detail-row
class=
"js-job-runner"
v-if=
"job.runner"
...
...
app/models/ci/build.rb
浏览文件 @
78a4189e
...
...
@@ -6,6 +6,7 @@ module Ci
include
ObjectStorage
::
BackgroundMove
include
Presentable
include
Importable
include
ChronicDurationAttribute
MissingDependenciesError
=
Class
.
new
(
StandardError
)
...
...
@@ -90,6 +91,8 @@ module Ci
after_commit
:update_project_statistics_after_save
,
on:
[
:create
,
:update
]
after_commit
:update_project_statistics
,
on: :destroy
chronic_duration_attribute_reader
:used_timeout_user_readable
,
:used_timeout
class
<<
self
# This is needed for url_for to work,
# as the controller is JobsController
...
...
@@ -120,6 +123,10 @@ module Ci
end
after_transition
pending: :running
do
|
build
|
build
.
used_timeout
=
build
.
timeout
build
.
timeout_source
=
build
.
should_use_runner_timeout?
?
'Runner'
:
'Project'
build
.
save!
build
.
run_after_commit
do
BuildHooksWorker
.
perform_async
(
id
)
end
...
...
@@ -232,15 +239,14 @@ module Ci
end
def
timeout
return
runner
.
maximum_job_timeout
if
should_use_runner_timeout
return
runner
.
maximum_job_timeout
if
should_use_runner_timeout
?
project
.
build_timeout
end
def
should_use_runner_timeout
def
should_use_runner_timeout
?
!
runner
.
nil?
&&
runner
.
defines_maximum_job_timeout?
&&
runner
.
maximum_job_timeout
<
project
.
build_timeout
end
private
:should_use_runner_timeout
def
triggered_by?
(
current_user
)
user
==
current_user
...
...
app/serializers/build_details_entity.rb
浏览文件 @
78a4189e
...
...
@@ -5,6 +5,11 @@ class BuildDetailsEntity < JobEntity
expose
:runner
,
using:
RunnerEntity
expose
:pipeline
,
using:
PipelineEntity
expose
:timeout
,
if:
->
(
*
)
{
!
build
.
used_timeout
.
nil?
}
do
|
build
|
{
value:
build
.
used_timeout_user_readable
,
source:
build
.
timeout_source
}
end
expose
:erased_by
,
if:
->
(
*
)
{
build
.
erased?
},
using:
UserEntity
expose
:erase_path
,
if:
->
(
*
)
{
build
.
erasable?
&&
can?
(
current_user
,
:erase_build
,
build
)
}
do
|
build
|
erase_project_job_path
(
project
,
build
)
...
...
db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb
0 → 100644
浏览文件 @
78a4189e
class
AddUsedTimeoutAndTimeoutSourceColumnsToCiBuilds
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
def
up
add_column
:ci_builds
,
:used_timeout
,
:integer
add_column
:ci_builds
,
:timeout_source
,
:string
end
def
down
remove_column
:ci_builds
,
:used_timeout
remove_column
:ci_builds
,
:timeout_source
end
end
db/schema.rb
浏览文件 @
78a4189e
...
...
@@ -311,6 +311,8 @@ ActiveRecord::Schema.define(version: 20180327101207) do
t
.
integer
"artifacts_metadata_store"
t
.
boolean
"protected"
t
.
integer
"failure_reason"
t
.
integer
"used_timeout"
t
.
string
"timeout_source"
end
add_index
"ci_builds"
,
[
"artifacts_expire_at"
],
name:
"index_ci_builds_on_artifacts_expire_at"
,
where:
"(artifacts_file <> ''::text)"
,
using: :btree
...
...
spec/lib/gitlab/import_export/safe_model_attributes.yml
浏览文件 @
78a4189e
...
...
@@ -283,6 +283,8 @@ CommitStatus:
-
retried
-
protected
-
failure_reason
-
used_timeout
-
timeout_source
Ci::Variable:
-
id
-
project_id
...
...
spec/models/concerns/chronic_duration_attribute_spec.rb
浏览文件 @
78a4189e
require
'spec_helper'
shared_examples
'ChronicDurationAttribute'
do
describe
'dynamically defined methods
'
do
it
{
expect
(
subject
.
class
).
to
be_public_method_defined
(
virtual_field
)
}
it
{
expect
(
subject
.
class
).
to
be_public_method_defined
(
"
#{
virtual_field
}
="
)
}
shared_examples
'ChronicDurationAttribute
reader
'
do
it
'contains dynamically created reader method
'
do
expect
(
subject
.
class
).
to
be_public_method_defined
(
virtual_field
)
end
it
'parses chronic duration input
'
do
subject
.
send
(
"
#{
virtual_field
}
="
,
"10m"
)
it
'outputs chronic duration formated value
'
do
subject
.
send
(
"
#{
source_field
}
="
,
120
)
expect
(
subject
.
send
(
source_field
)).
to
eq
(
600
)
end
expect
(
subject
.
send
(
virtual_field
)).
to
eq
(
'2m'
)
end
end
shared_examples
'ChronicDurationAttribute writer'
do
it
'contains dynamically created writer method'
do
expect
(
subject
.
class
).
to
be_public_method_defined
(
"
#{
virtual_field
}
="
)
end
it
'outputs chronic duration formated value
'
do
subject
.
send
(
"
#{
source_field
}
="
,
120
)
it
'parses chronic duration input
'
do
subject
.
send
(
"
#{
virtual_field
}
="
,
"10m"
)
expect
(
subject
.
send
(
virtual_field
)).
to
eq
(
'2m'
)
end
expect
(
subject
.
send
(
source_field
)).
to
eq
(
600
)
end
end
describe
'ChronicDurationAttribute'
do
let
(
:source_field
)
{
:maximum_job_timeout
}
let
(
:virtual_field
)
{
:maximum_job_timeout_user_readable
}
subject
{
Ci
::
Runner
.
new
}
let
(
:source_field
)
{
:maximum_job_timeout
}
let
(
:virtual_field
)
{
:maximum_job_timeout_user_readable
}
subject
{
Ci
::
Runner
.
new
}
it_behaves_like
'ChronicDurationAttribute reader'
it_behaves_like
'ChronicDurationAttribute writer'
end
describe
'ChronicDurationAttribute - reader'
do
let
(
:source_field
)
{
:used_timeout
}
let
(
:virtual_field
)
{
:used_timeout_user_readable
}
subject
{
Ci
::
Build
.
new
}
it
"doesn't contain dynamically created writer method"
do
expect
(
subject
.
class
).
not_to
be_public_method_defined
(
"
#{
virtual_field
}
="
)
end
it_behaves_like
'ChronicDurationAttribute'
it_behaves_like
'ChronicDurationAttribute
reader
'
end
spec/services/ci/retry_build_service_spec.rb
浏览文件 @
78a4189e
...
...
@@ -29,7 +29,8 @@ describe Ci::RetryBuildService do
commit_id deployments erased_by_id last_deployment project_id
runner_id tag_taggings taggings tags trigger_request_id
user_id auto_canceled_by_id retried failure_reason
artifacts_file_store artifacts_metadata_store]
.
freeze
artifacts_file_store artifacts_metadata_store
used_timeout timeout_source]
.
freeze
shared_examples
'build duplication'
do
let
(
:another_pipeline
)
{
create
(
:ci_empty_pipeline
,
project:
project
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录