Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1f1f5707
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,发现更多精彩内容 >>
提交
1f1f5707
编写于
5月 30, 2017
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement CI/CD config attributes for persisted stages
上级
ff61e2b7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
53 addition
and
4 deletion
+53
-4
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+12
-2
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+40
-1
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+1
-1
未找到文件。
lib/ci/gitlab_ci_yaml_processor.rb
浏览文件 @
1f1f5707
...
...
@@ -50,10 +50,20 @@ module Ci
end
end
def
stages_for_ref
(
ref
,
tag
=
false
,
trigger_request
=
nil
)
stages
=
@stages
.
map
do
|
stage
|
builds
=
builds_for_stage_and_ref
(
stage
,
ref
,
tag
,
trigger_request
)
{
name:
stage
,
builds_attributes:
builds
.
to_a
}
if
builds
.
any?
end
stages
.
compact
.
sort_by
{
|
stage
|
@stages
.
index
(
stage
[
:name
])
}
end
def
build_attributes
(
name
)
job
=
@jobs
[
name
.
to_sym
]
||
{}
{
stage_idx:
@stages
.
index
(
job
[
:stage
]),
{
stage_idx:
@stages
.
index
(
job
[
:stage
]),
stage:
job
[
:stage
],
commands:
job
[
:commands
],
tag_list:
job
[
:tags
]
||
[],
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
浏览文件 @
1f1f5707
require
'spec_helper'
module
Ci
describe
GitlabCiYamlProcessor
,
lib:
true
do
describe
GitlabCiYamlProcessor
,
:lib
do
subject
{
described_class
.
new
(
config
,
path
)
}
let
(
:path
)
{
'path'
}
describe
'our current .gitlab-ci.yml'
do
...
...
@@ -82,6 +83,44 @@ module Ci
end
end
describe
'#stages_for_ref'
do
context
'when no refs policy is specified'
do
let
(
:config
)
do
YAML
.
dump
(
production:
{
stage:
'deploy'
,
script:
'cap prod'
},
rspec:
{
stage:
'test'
,
script:
'rspec'
},
spinach:
{
stage:
'test'
,
script:
'spinach'
})
end
it
'returns model attributes for stages with nested jobs'
do
attributes
=
subject
.
stages_for_ref
(
'master'
)
expect
(
attributes
.
size
).
to
eq
2
expect
(
attributes
.
dig
(
0
,
:name
)).
to
eq
'test'
expect
(
attributes
.
dig
(
1
,
:name
)).
to
eq
'deploy'
expect
(
attributes
.
dig
(
0
,
:builds_attributes
,
0
,
:name
)).
to
eq
'rspec'
expect
(
attributes
.
dig
(
0
,
:builds_attributes
,
1
,
:name
)).
to
eq
'spinach'
expect
(
attributes
.
dig
(
1
,
:builds_attributes
,
0
,
:name
)).
to
eq
'production'
end
end
context
'when refs policy is specified'
do
let
(
:config
)
do
YAML
.
dump
(
production:
{
stage:
'deploy'
,
script:
'cap prod'
,
only:
[
'master'
]
},
spinach:
{
stage:
'test'
,
script:
'spinach'
,
only:
[
'tags'
]
})
end
it
'returns stage attributes except of jobs assigned to master'
do
# true flag argument means matching jobs for tags
#
attributes
=
subject
.
stages_for_ref
(
'feature'
,
true
)
expect
(
attributes
.
size
).
to
eq
1
expect
(
attributes
.
dig
(
0
,
:name
)).
to
eq
'test'
expect
(
attributes
.
dig
(
0
,
:builds_attributes
,
0
,
:name
)).
to
eq
'spinach'
end
end
end
describe
"#builds_for_ref"
do
let
(
:type
)
{
'test'
}
...
...
spec/services/ci/create_pipeline_service_spec.rb
浏览文件 @
1f1f5707
require
'spec_helper'
describe
Ci
::
CreatePipelineService
,
services:
true
do
describe
Ci
::
CreatePipelineService
,
:services
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:admin
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录