Update runner registration API
This commit is contained in:
parent
d02694c5c5
commit
62f053e4e5
2 changed files with 5 additions and 4 deletions
|
@ -14,11 +14,12 @@ module API
|
|||
optional :locked, type: Boolean, desc: 'Should Runner be locked for current project'
|
||||
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 :maximum_job_timeout_human_readable, type: String, desc: 'Maximum timeout set when this Runner will handle the job'
|
||||
optional :maximum_job_timeout, type: String, desc: 'Maximum timeout set when this Runner will handle the job'
|
||||
end
|
||||
post '/' do
|
||||
attributes = attributes_for_keys([:description, :locked, :run_untagged, :tag_list, :maximum_job_timeout_human_readable])
|
||||
attributes = attributes_for_keys([:description, :locked, :run_untagged, :tag_list])
|
||||
.merge(get_runner_details_from_request)
|
||||
.merge(maximum_job_timeout_human_readable: params[:maximum_job_timeout])
|
||||
|
||||
runner =
|
||||
if runner_registration_token_valid?
|
||||
|
|
|
@ -112,7 +112,7 @@ describe API::Runner do
|
|||
context 'when maximum job timeout is specified' do
|
||||
it 'creates runner' do
|
||||
post api('/runners'), token: registration_token,
|
||||
maximum_job_timeout_human_readable: '2h 30m'
|
||||
maximum_job_timeout: '2h 30m'
|
||||
|
||||
expect(response).to have_gitlab_http_status 201
|
||||
expect(Ci::Runner.first.maximum_job_timeout).to eq(9000)
|
||||
|
@ -121,7 +121,7 @@ describe API::Runner do
|
|||
context 'when maximum job timeout is empty' do
|
||||
it 'creates runner' do
|
||||
post api('/runners'), token: registration_token,
|
||||
maximum_job_timeout_human_readable: ''
|
||||
maximum_job_timeout: ''
|
||||
|
||||
expect(response).to have_gitlab_http_status 201
|
||||
expect(Ci::Runner.first.maximum_job_timeout).to be_nil
|
||||
|
|
Loading…
Reference in a new issue