Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
07c7ba1b
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,发现更多精彩内容 >>
提交
07c7ba1b
编写于
11月 24, 2017
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow to drop jobs for deleted projects
上级
d58bab4a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
10 deletion
+13
-10
app/models/ci/build.rb
app/models/ci/build.rb
+1
-0
app/models/commit_status.rb
app/models/commit_status.rb
+10
-6
app/workers/stuck_ci_jobs_worker.rb
app/workers/stuck_ci_jobs_worker.rb
+0
-2
spec/workers/stuck_ci_jobs_worker_spec.rb
spec/workers/stuck_ci_jobs_worker_spec.rb
+2
-2
未找到文件。
app/models/ci/build.rb
浏览文件 @
07c7ba1b
...
...
@@ -104,6 +104,7 @@ module Ci
end
before_transition
any
=>
[
:failed
]
do
|
build
|
next
unless
build
.
project
next
if
build
.
retries_max
.
zero?
if
build
.
retries_count
<
build
.
retries_max
...
...
app/models/commit_status.rb
浏览文件 @
07c7ba1b
...
...
@@ -17,6 +17,7 @@ class CommitStatus < ActiveRecord::Base
validates
:name
,
presence:
true
,
unless: :importing?
alias_attribute
:author
,
:user
alias_attribute
:pipeline_id
,
:commit_id
scope
:failed_but_allowed
,
->
do
where
(
allow_failure:
true
,
status:
[
:failed
,
:canceled
])
...
...
@@ -103,26 +104,29 @@ class CommitStatus < ActiveRecord::Base
end
after_transition
do
|
commit_status
,
transition
|
next
unless
commit_status
.
project
next
if
transition
.
loopback?
commit_status
.
run_after_commit
do
if
pipeline
if
pipeline
_id
if
complete?
||
manual?
PipelineProcessWorker
.
perform_async
(
pipeline
.
id
)
PipelineProcessWorker
.
perform_async
(
pipeline
_
id
)
else
PipelineUpdateWorker
.
perform_async
(
pipeline
.
id
)
PipelineUpdateWorker
.
perform_async
(
pipeline
_
id
)
end
end
StageUpdateWorker
.
perform_async
(
commit_status
.
stage_id
)
ExpireJobCacheWorker
.
perform_async
(
commit_status
.
id
)
StageUpdateWorker
.
perform_async
(
stage_id
)
ExpireJobCacheWorker
.
perform_async
(
id
)
end
end
after_transition
any
=>
:failed
do
|
commit_status
|
next
unless
commit_status
.
project
commit_status
.
run_after_commit
do
MergeRequests
::
AddTodoWhenBuildFailsService
.
new
(
p
ipeline
.
p
roject
,
nil
).
execute
(
self
)
.
new
(
project
,
nil
).
execute
(
self
)
end
end
end
...
...
app/workers/stuck_ci_jobs_worker.rb
浏览文件 @
07c7ba1b
...
...
@@ -48,7 +48,6 @@ class StuckCiJobsWorker
loop
do
jobs
=
Ci
::
Build
.
where
(
status:
status
)
.
where
(
'ci_builds.updated_at < ?'
,
timeout
.
ago
)
.
joins
(
:project
).
merge
(
Project
.
without_deleted
)
.
includes
(
:tags
,
:runner
,
project: :namespace
)
.
limit
(
100
)
.
to_a
...
...
@@ -67,4 +66,3 @@ class StuckCiJobsWorker
end
end
end
spec/workers/stuck_ci_jobs_worker_spec.rb
浏览文件 @
07c7ba1b
...
...
@@ -105,8 +105,8 @@ describe StuckCiJobsWorker do
job
.
project
.
update
(
pending_delete:
true
)
end
it
'does
not
drop job'
do
expect_any_instance_of
(
Ci
::
Build
).
not_
to
receive
(
:drop
)
it
'does drop job'
do
expect_any_instance_of
(
Ci
::
Build
).
to
receive
(
:drop
)
worker
.
perform
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录