Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9147a5f8
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,发现更多精彩内容 >>
提交
9147a5f8
编写于
3月 01, 2018
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add support for checking attributes in build policies
上级
42b2abbe
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
26 addition
and
17 deletion
+26
-17
lib/gitlab/ci/build/policy/kubernetes.rb
lib/gitlab/ci/build/policy/kubernetes.rb
+1
-1
lib/gitlab/ci/build/policy/refs.rb
lib/gitlab/ci/build/policy/refs.rb
+1
-1
lib/gitlab/ci/build/policy/specification.rb
lib/gitlab/ci/build/policy/specification.rb
+1
-1
lib/gitlab/ci/build/policy/variables.rb
lib/gitlab/ci/build/policy/variables.rb
+2
-2
lib/gitlab/ci/pipeline/expression/statement.rb
lib/gitlab/ci/pipeline/expression/statement.rb
+7
-1
lib/gitlab/ci/yaml_processor.rb
lib/gitlab/ci/yaml_processor.rb
+8
-6
spec/lib/gitlab/ci/build/policy/variables_spec.rb
spec/lib/gitlab/ci/build/policy/variables_spec.rb
+6
-5
未找到文件。
lib/gitlab/ci/build/policy/kubernetes.rb
浏览文件 @
9147a5f8
...
...
@@ -9,7 +9,7 @@ module Gitlab
end
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
_attributes
=
nil
)
pipeline
.
has_kubernetes_active?
end
end
...
...
lib/gitlab/ci/build/policy/refs.rb
浏览文件 @
9147a5f8
...
...
@@ -7,7 +7,7 @@ module Gitlab
@patterns
=
Array
(
refs
)
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
_attributes
=
nil
)
@patterns
.
any?
do
|
pattern
|
pattern
,
path
=
pattern
.
split
(
'@'
,
2
)
...
...
lib/gitlab/ci/build/policy/specification.rb
浏览文件 @
9147a5f8
...
...
@@ -15,7 +15,7 @@ module Gitlab
@spec
=
spec
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
attributes
=
nil
)
raise
NotImplementedError
end
end
...
...
lib/gitlab/ci/build/policy/variables.rb
浏览文件 @
9147a5f8
...
...
@@ -7,13 +7,13 @@ module Gitlab
@expressions
=
Array
(
expressions
)
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
attributes
)
statements
=
@expressions
.
map
do
|
statement
|
::
Gitlab
::
Ci
::
Pipeline
::
Expression
::
Statement
.
new
(
statement
,
pipeline
)
end
statements
.
any?
{
|
statement
|
statement
.
truthful?
}
statements
.
any?
(
&
:truthful?
)
end
end
end
...
...
lib/gitlab/ci/pipeline/expression/statement.rb
浏览文件 @
9147a5f8
...
...
@@ -19,7 +19,13 @@ module Gitlab
return
if
pipeline
.
nil?
@variables
=
pipeline
.
variables
.
map
do
|
variable
|
# temporary refactoring stubs
#
@variables
=
pipeline
.
project
.
predefined_variables
.
map
do
|
variable
|
[
variable
.
fetch
(
:key
),
variable
.
fetch
(
:value
)]
end
@variables
+=
pipeline
.
variables
.
map
do
|
variable
|
[
variable
.
key
,
variable
.
value
]
end
...
...
lib/gitlab/ci/yaml_processor.rb
浏览文件 @
9147a5f8
...
...
@@ -54,19 +54,21 @@ module Gitlab
end
def
pipeline_stage_builds
(
stage
,
pipeline
)
selected_jobs
=
@jobs
.
select
do
|
_
,
job
|
next
unless
job
[
:stage
]
==
stage
builds_attributes
=
@jobs
.
map
do
|
job
|
build_attributes
(
job
[
:name
])
end
builds_attributes
.
select
do
|
_
,
attributes
|
next
unless
build
[
:stage
]
==
stage
only_specs
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
job
.
fetch
(
:only
,
{}))
except_specs
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
job
.
fetch
(
:except
,
{}))
only_specs
.
all?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
)
}
&&
except_specs
.
none?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
)
}
only_specs
.
all?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
,
attributes
)
}
&&
except_specs
.
none?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
,
attributes
)
}
end
selected_jobs
.
map
{
|
_
,
job
|
build_attributes
(
job
[
:name
])
}
end
def
stage_seeds
(
pipeline
)
...
...
spec/lib/gitlab/ci/build/policy/variables_spec.rb
浏览文件 @
9147a5f8
...
...
@@ -2,6 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
Ci
::
Build
::
Policy
::
Variables
do
let
(
:pipeline
)
{
build
(
:ci_pipeline
,
ref:
'master'
)
}
let
(
:attributes
)
{
double
(
:attributes
)
}
before
do
pipeline
.
variables
.
build
(
key:
'CI_PROJECT_NAME'
,
value:
''
)
...
...
@@ -11,31 +12,31 @@ describe Gitlab::Ci::Build::Policy::Variables do
it
'is satisfied by a defined and existing variable'
do
policy
=
described_class
.
new
([
'$CI_PROJECT_ID'
,
'$UNDEFINED'
])
expect
(
policy
).
to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
attributes
)
end
it
'is not satisfied by an overriden empty variable'
do
policy
=
described_class
.
new
([
'$CI_PROJECT_NAME'
])
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
attributes
)
end
it
'is satisfied by a truthy pipeline expression'
do
policy
=
described_class
.
new
([
%($CI_PIPELINE_SOURCE == "#{pipeline.source}")
])
expect
(
policy
).
to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
attributes
)
end
it
'is not satisfied by a falsy pipeline expression'
do
policy
=
described_class
.
new
([
%($CI_PIPELINE_SOURCE == "invalid source")
])
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
attributes
)
end
it
'is satisfied by a truthy expression using undefined variable'
do
policy
=
described_class
.
new
([
'$UNDEFINED'
,
'$UNDEFINED == null'
])
expect
(
policy
).
to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
attributes
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录