Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b8cf2a34
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 搜索 >>
提交
b8cf2a34
编写于
5月 06, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set run untagged option when registering a runner
上级
9ba72378
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
12 deletion
+38
-12
lib/ci/api/runners.rb
lib/ci/api/runners.rb
+6
-9
spec/requests/ci/api/runners_spec.rb
spec/requests/ci/api/runners_spec.rb
+32
-3
未找到文件。
lib/ci/api/runners.rb
浏览文件 @
b8cf2a34
...
...
@@ -28,20 +28,17 @@ module Ci
post
"register"
do
required_attributes!
[
:token
]
attributes
=
{
description:
params
[
:description
],
tag_list:
params
[
:tag_list
],
run_untagged:
params
[
:run_untagged
]
||
true
}
runner
=
if
runner_registration_token_valid?
# Create shared runner. Requires admin access
Ci
::
Runner
.
create
(
description:
params
[
:description
],
tag_list:
params
[
:tag_list
],
is_shared:
true
)
Ci
::
Runner
.
create
(
attributes
.
merge
(
is_shared:
true
))
elsif
project
=
Project
.
find_by
(
runners_token:
params
[
:token
])
# Create a specific runner for project.
project
.
runners
.
create
(
description:
params
[
:description
],
tag_list:
params
[
:tag_list
]
)
project
.
runners
.
create
(
attributes
)
end
return
forbidden!
unless
runner
...
...
spec/requests/ci/api/runners_spec.rb
浏览文件 @
b8cf2a34
...
...
@@ -15,13 +15,17 @@ describe Ci::API::API do
context
'when runner token is provided'
do
before
{
post
ci_api
(
"/runners/register"
),
token:
registration_token
}
it
'creates runner'
do
it
'creates runner
with default values
'
do
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
Ci
::
Runner
.
first
.
run_untagged
).
to
be
true
end
end
context
'when runner description is provided'
do
before
{
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
description:
"server.hostname"
}
before
do
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
description:
"server.hostname"
end
it
'creates runner'
do
expect
(
response
.
status
).
to
eq
(
201
)
...
...
@@ -30,7 +34,10 @@ describe Ci::API::API do
end
context
'when runner tags are provided'
do
before
{
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
tag_list:
"tag1, tag2"
}
before
do
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
tag_list:
"tag1, tag2"
end
it
'creates runner'
do
expect
(
response
.
status
).
to
eq
(
201
)
...
...
@@ -38,6 +45,28 @@ describe Ci::API::API do
end
end
context
'when option for running untagged jobs is provided'
do
context
'when tags are provided'
do
it
'creates runner'
do
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
run_untagged:
false
,
tag_list:
[
'tag'
]
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
Ci
::
Runner
.
first
.
run_untagged
).
to
be
false
end
end
context
'when tags are not provided'
do
it
'does not create runner'
do
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
run_untagged:
false
expect
(
response
.
status
).
to
eq
(
404
)
end
end
end
context
'when project token is provided'
do
let
(
:project
)
{
FactoryGirl
.
create
(
:empty_project
)
}
before
{
post
ci_api
(
"/runners/register"
),
token:
project
.
runners_token
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录