Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
8516e3a4
Commit
8516e3a4
authored
May 09, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support 'active' setting on Runner Registration API endpoint
parent
b63cd070
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
1 deletion
+25
-1
lib/api/runner.rb
lib/api/runner.rb
+2
-1
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+23
-0
No files found.
lib/api/runner.rb
View file @
8516e3a4
...
@@ -11,13 +11,14 @@ module API
...
@@ -11,13 +11,14 @@ module API
requires
:token
,
type:
String
,
desc:
'Registration token'
requires
:token
,
type:
String
,
desc:
'Registration token'
optional
:description
,
type:
String
,
desc:
%q(Runner's description)
optional
:description
,
type:
String
,
desc:
%q(Runner's description)
optional
:info
,
type:
Hash
,
desc:
%q(Runner's metadata)
optional
:info
,
type:
Hash
,
desc:
%q(Runner's metadata)
optional
:active
,
type:
Boolean
,
desc:
'Should Runner be active'
optional
:locked
,
type:
Boolean
,
desc:
'Should Runner be locked for current project'
optional
:locked
,
type:
Boolean
,
desc:
'Should Runner be locked for current project'
optional
:run_untagged
,
type:
Boolean
,
desc:
'Should Runner handle untagged jobs'
optional
:run_untagged
,
type:
Boolean
,
desc:
'Should Runner handle untagged jobs'
optional
:tag_list
,
type:
Array
[
String
],
desc:
%q(List of Runner's tags)
optional
:tag_list
,
type:
Array
[
String
],
desc:
%q(List of Runner's tags)
optional
:maximum_timeout
,
type:
Integer
,
desc:
'Maximum timeout set when this Runner will handle the job'
optional
:maximum_timeout
,
type:
Integer
,
desc:
'Maximum timeout set when this Runner will handle the job'
end
end
post
'/'
do
post
'/'
do
attributes
=
attributes_for_keys
([
:description
,
:locked
,
:run_untagged
,
:tag_list
,
:maximum_timeout
])
attributes
=
attributes_for_keys
([
:description
,
:
active
,
:
locked
,
:run_untagged
,
:tag_list
,
:maximum_timeout
])
.
merge
(
get_runner_details_from_request
)
.
merge
(
get_runner_details_from_request
)
runner
=
runner
=
...
...
spec/requests/api/runner_spec.rb
View file @
8516e3a4
...
@@ -41,6 +41,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
...
@@ -41,6 +41,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
expect
(
json_response
[
'id'
]).
to
eq
(
runner
.
id
)
expect
(
json_response
[
'id'
]).
to
eq
(
runner
.
id
)
expect
(
json_response
[
'token'
]).
to
eq
(
runner
.
token
)
expect
(
json_response
[
'token'
]).
to
eq
(
runner
.
token
)
expect
(
runner
.
run_untagged
).
to
be
true
expect
(
runner
.
run_untagged
).
to
be
true
expect
(
runner
.
active
).
to
be
true
expect
(
runner
.
token
).
not_to
eq
(
registration_token
)
expect
(
runner
.
token
).
not_to
eq
(
registration_token
)
expect
(
runner
).
to
be_instance_type
expect
(
runner
).
to
be_instance_type
end
end
...
@@ -129,6 +130,28 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
...
@@ -129,6 +130,28 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
end
end
end
end
context
'when option for activating a Runner is provided'
do
context
'when active is set to true'
do
it
'creates runner'
do
post
api
(
'/runners'
),
token:
registration_token
,
active:
true
expect
(
response
).
to
have_gitlab_http_status
201
expect
(
Ci
::
Runner
.
first
.
active
).
to
be
true
end
end
context
'when active is set to false'
do
it
'creates runner'
do
post
api
(
'/runners'
),
token:
registration_token
,
active:
false
expect
(
response
).
to
have_gitlab_http_status
201
expect
(
Ci
::
Runner
.
first
.
active
).
to
be
false
end
end
end
context
'when maximum job timeout is specified'
do
context
'when maximum job timeout is specified'
do
it
'creates runner'
do
it
'creates runner'
do
post
api
(
'/runners'
),
token:
registration_token
,
post
api
(
'/runners'
),
token:
registration_token
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment