Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8fc2fbb6
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,体验更适合开发者的 AI 搜索 >>
提交
8fc2fbb6
编写于
8月 14, 2019
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'limit-amount-of-needs' into 'master'
Add `ci_dag_limit_needs` See merge request gitlab-org/gitlab-ce!31803
上级
ecee476a
fcc20fde
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
52 addition
and
4 deletion
+52
-4
lib/gitlab/ci/pipeline/seed/build.rb
lib/gitlab/ci/pipeline/seed/build.rb
+19
-1
spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
+33
-3
未找到文件。
lib/gitlab/ci/pipeline/seed/build.rb
浏览文件 @
8fc2fbb6
...
...
@@ -9,6 +9,10 @@ module Gitlab
delegate
:dig
,
to: :@attributes
# When the `ci_dag_limit_needs` is enabled it uses the lower limit
LOW_NEEDS_LIMIT
=
5
HARD_NEEDS_LIMIT
=
50
def
initialize
(
pipeline
,
attributes
,
previous_stages
)
@pipeline
=
pipeline
@attributes
=
attributes
...
...
@@ -77,9 +81,15 @@ module Gitlab
end
def
needs_errors
return
unless
Feature
.
enabled?
(
:ci_dag_support
,
@pipeline
.
project
)
return
if
@needs_attributes
.
nil?
if
@needs_attributes
.
size
>
max_needs_allowed
return
[
"
#{
name
}
: one job can only need
#{
max_needs_allowed
}
others, but you have listed
#{
@needs_attributes
.
size
}
. "
\
"See needs keyword documentation for more details"
]
end
@needs_attributes
.
flat_map
do
|
need
|
result
=
@previous_stages
.
any?
do
|
stage
|
stage
.
seeds_names
.
include?
(
need
[
:name
])
...
...
@@ -88,6 +98,14 @@ module Gitlab
"
#{
name
}
: needs '
#{
need
[
:name
]
}
'"
unless
result
end
.
compact
end
def
max_needs_allowed
if
Feature
.
enabled?
(
:ci_dag_limit_needs
,
@project
,
default_enabled:
true
)
LOW_NEEDS_LIMIT
else
HARD_NEEDS_LIMIT
end
end
end
end
end
...
...
spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
浏览文件 @
8fc2fbb6
...
...
@@ -386,12 +386,16 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
describe
'applying needs: dependency'
do
subject
{
seed_build
}
let
(
:needs_count
)
{
1
}
let
(
:needs_attributes
)
do
Array
.
new
(
needs_count
,
name:
'build'
)
end
let
(
:attributes
)
do
{
name:
'rspec'
,
needs_attributes:
[{
name:
'build'
}]
needs_attributes:
needs_attributes
}
end
...
...
@@ -429,5 +433,31 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
expect
(
subject
.
errors
).
to
be_empty
end
end
context
'when lower limit of needs is reached'
do
before
do
stub_feature_flags
(
ci_dag_limit_needs:
true
)
end
let
(
:needs_count
)
{
described_class
::
LOW_NEEDS_LIMIT
+
1
}
it
"returns an error"
do
expect
(
subject
.
errors
).
to
contain_exactly
(
"rspec: one job can only need 5 others, but you have listed 6. See needs keyword documentation for more details"
)
end
end
context
'when upper limit of needs is reached'
do
before
do
stub_feature_flags
(
ci_dag_limit_needs:
false
)
end
let
(
:needs_count
)
{
described_class
::
HARD_NEEDS_LIMIT
+
1
}
it
"returns an error"
do
expect
(
subject
.
errors
).
to
contain_exactly
(
"rspec: one job can only need 50 others, but you have listed 51. See needs keyword documentation for more details"
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录