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
557c85a7
Commit
557c85a7
authored
Mar 21, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use raw value of maximum_timeout for Runner registration API
parent
9ccde9cc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
lib/api/runner.rb
lib/api/runner.rb
+2
-3
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+1
-1
No files found.
lib/api/runner.rb
View file @
557c85a7
...
@@ -14,12 +14,11 @@ module API
...
@@ -14,12 +14,11 @@ module API
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:
String
,
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
])
attributes
=
attributes_for_keys
([
:description
,
:locked
,
:run_untagged
,
:tag_list
,
:maximum_timeout
])
.
merge
(
get_runner_details_from_request
)
.
merge
(
get_runner_details_from_request
)
.
merge
(
maximum_timeout_human_readable:
params
[
:maximum_timeout
])
runner
=
runner
=
if
runner_registration_token_valid?
if
runner_registration_token_valid?
...
...
spec/requests/api/runner_spec.rb
View file @
557c85a7
...
@@ -112,7 +112,7 @@ describe API::Runner do
...
@@ -112,7 +112,7 @@ describe API::Runner do
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
,
maximum_timeout:
'2h 30m'
maximum_timeout:
9000
expect
(
response
).
to
have_gitlab_http_status
201
expect
(
response
).
to
have_gitlab_http_status
201
expect
(
Ci
::
Runner
.
first
.
maximum_timeout
).
to
eq
(
9000
)
expect
(
Ci
::
Runner
.
first
.
maximum_timeout
).
to
eq
(
9000
)
...
...
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