Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
48389e99
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,发现更多精彩内容 >>
提交
48389e99
编写于
7月 27, 2017
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix pipeline
上级
19789154
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
21 deletion
+18
-21
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+18
-12
spec/services/ci/pipeline_trigger_service_spec.rb
spec/services/ci/pipeline_trigger_service_spec.rb
+0
-9
未找到文件。
app/services/ci/create_pipeline_service.rb
浏览文件 @
48389e99
module
Ci
class
CreatePipelineService
<
BaseService
class
ParameterValidationError
<
StandardError
end
class
InsufficientConditionError
<
StandardError
attr_reader
:pipeline
def
initialize
(
pipeline
)
@pipeline
=
pipeline
end
end
attr_reader
:pipeline
...
...
@@ -32,8 +38,8 @@ module Ci
.
execute
(
pipeline
)
end
rescue
ParameterValida
tionError
=>
e
return
e
rescue
InsufficientCondi
tionError
=>
e
return
e
.
pipeline
rescue
ActiveRecord
::
RecordInvalid
=>
e
return
error
(
"Failed to persist the pipeline:
#{
e
}
"
)
...
...
@@ -53,39 +59,39 @@ module Ci
def
validate
(
triggering_user
,
ignore_skip_ci
:,
save_on_errors
:)
unless
project
.
builds_enabled?
raise
ParameterValida
tionError
,
error
(
'Pipeline is disabled'
)
raise
InsufficientCondi
tionError
,
error
(
'Pipeline is disabled'
)
end
unless
allowed_to_trigger_pipeline?
(
triggering_user
)
if
can?
(
triggering_user
,
:create_pipeline
,
project
)
raise
ParameterValida
tionError
,
error
(
"Insufficient permissions for protected ref '
#{
ref
}
'"
)
raise
InsufficientCondi
tionError
,
error
(
"Insufficient permissions for protected ref '
#{
ref
}
'"
)
else
raise
ParameterValida
tionError
,
error
(
'Insufficient permissions to create a new pipeline'
)
raise
InsufficientCondi
tionError
,
error
(
'Insufficient permissions to create a new pipeline'
)
end
end
unless
branch?
||
tag?
raise
ParameterValida
tionError
,
error
(
'Reference not found'
)
raise
InsufficientCondi
tionError
,
error
(
'Reference not found'
)
end
unless
commit
raise
ParameterValida
tionError
,
error
(
'Commit not found'
)
raise
InsufficientCondi
tionError
,
error
(
'Commit not found'
)
end
unless
pipeline
.
config_processor
unless
pipeline
.
ci_yaml_file
raise
ParameterValida
tionError
,
error
(
"Missing
#{
pipeline
.
ci_yaml_file_path
}
file"
)
raise
InsufficientCondi
tionError
,
error
(
"Missing
#{
pipeline
.
ci_yaml_file_path
}
file"
)
end
raise
ParameterValida
tionError
,
error
(
pipeline
.
yaml_errors
,
save:
save_on_errors
)
raise
InsufficientCondi
tionError
,
error
(
pipeline
.
yaml_errors
,
save:
save_on_errors
)
end
if
!
ignore_skip_ci
&&
skip_ci?
pipeline
.
skip
if
save_on_errors
r
eturn
pipeline
r
aise
InsufficientConditionError
,
pipeline
end
unless
pipeline
.
has_stage_seeds?
raise
ParameterValida
tionError
,
error
(
'No stages / jobs for this pipeline.'
)
raise
InsufficientCondi
tionError
,
error
(
'No stages / jobs for this pipeline.'
)
end
end
...
...
spec/services/ci/pipeline_trigger_service_spec.rb
浏览文件 @
48389e99
...
...
@@ -40,15 +40,6 @@ describe Ci::PipelineTriggerService, services: true do
expect
(
result
[
:pipeline
].
variables
.
first
.
value
).
to
eq
(
variables
.
values
.
first
)
end
end
context
'when params have two variables and keys are duplicated'
do
let
(
:variables
)
{
[{
key:
'AAA'
,
value:
'AAA123'
},
{
key:
'AAA'
,
value:
'BBB123'
}]
}
it
'returns error'
do
expect
{
result
}.
not_to
change
{
Ci
::
Pipeline
.
count
}
expect
(
result
[
:http_status
]).
to
eq
(
400
)
end
end
end
context
'when params have a non-existsed ref'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录