Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
52ebeb5a
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,发现更多精彩内容 >>
提交
52ebeb5a
编写于
9月 13, 2016
作者:
K
Katarzyna Kobierska
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Build attributes with hash, fix gitlab yaml processor tests
上级
cd556253
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
11 deletion
+34
-11
app/services/ci/create_pipeline_builds_service.rb
app/services/ci/create_pipeline_builds_service.rb
+13
-4
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+21
-7
未找到文件。
app/services/ci/create_pipeline_builds_service.rb
浏览文件 @
52ebeb5a
...
...
@@ -13,16 +13,25 @@ module Ci
private
def
create_build
(
build_attributes
)
build_attributes
=
build_attributes
.
merge
(
build_attributes
=
{
stage_idx:
build_attributes
[
:stage_idx
],
stage:
build_attributes
[
:stage
],
commands:
build_attributes
[
:commands
],
tag_list:
build_attributes
[
:tag_list
],
name:
build_attributes
[
:name
],
when:
build_attributes
[
:when
],
allow_failure:
build_attributes
[
:allow_failure
],
environment:
build_attributes
[
:environment
],
yaml_variables:
build_attributes
[
:yaml_variables
],
options:
build_attributes
[
:options
],
pipeline:
pipeline
,
project:
pipeline
.
project
,
ref:
pipeline
.
ref
,
tag:
pipeline
.
tag
,
user:
current_user
,
trigger_request:
trigger_request
)
# OPTIMIZE: We copy over all attributes of Job into Build, therefore this workaround
build_attributes
=
build_attributes
.
except
(
:only
,
:except
)
}
pipeline
.
builds
.
create
(
build_attributes
)
end
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
浏览文件 @
52ebeb5a
...
...
@@ -26,7 +26,9 @@ module Ci
allow_failure:
false
,
when:
"on_success"
,
environment:
nil
,
yaml_variables:
[]
yaml_variables:
[],
only:
nil
,
except:
nil
})
end
...
...
@@ -443,7 +445,9 @@ module Ci
allow_failure:
false
,
when:
"on_success"
,
environment:
nil
,
yaml_variables:
[]
yaml_variables:
[],
only:
nil
,
except:
nil
})
end
...
...
@@ -471,7 +475,9 @@ module Ci
allow_failure:
false
,
when:
"on_success"
,
environment:
nil
,
yaml_variables:
[]
yaml_variables:
[],
only:
nil
,
except:
nil
})
end
end
...
...
@@ -716,7 +722,9 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
yaml_variables:
[]
yaml_variables:
[],
only:
nil
,
except:
nil
})
end
...
...
@@ -859,7 +867,9 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
yaml_variables:
[]
yaml_variables:
[],
only:
nil
,
except:
nil
})
end
end
...
...
@@ -904,7 +914,9 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
yaml_variables:
[]
yaml_variables:
[],
only:
nil
,
except:
nil
})
expect
(
subject
.
second
).
to
eq
({
stage:
"build"
,
...
...
@@ -916,7 +928,9 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
yaml_variables:
[]
yaml_variables:
[],
only:
nil
,
except:
nil
})
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录