Add UI support for per-runner job timeout
This commit is contained in:
parent
834f473821
commit
b6d26f979c
|
@ -8,7 +8,7 @@ module Ci
|
|||
ONLINE_CONTACT_TIMEOUT = 1.hour
|
||||
UPDATE_DB_RUNNER_INFO_EVERY = 40.minutes
|
||||
AVAILABLE_SCOPES = %w[specific shared active paused online].freeze
|
||||
FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level].freeze
|
||||
FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level job_upper_timeout].freeze
|
||||
|
||||
has_many :builds
|
||||
has_many :runner_projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
|
||||
|
|
|
@ -18,6 +18,11 @@
|
|||
= runner.version
|
||||
%td
|
||||
= runner.ip_address
|
||||
%td
|
||||
- if runner.defines_job_upper_timeout?
|
||||
= runner.job_upper_timeout
|
||||
- else
|
||||
n/a
|
||||
%td
|
||||
- if runner.shared?
|
||||
n/a
|
||||
|
|
|
@ -61,6 +61,7 @@
|
|||
%th Description
|
||||
%th Version
|
||||
%th IP Address
|
||||
%th Timeout
|
||||
%th Projects
|
||||
%th Jobs
|
||||
%th Tags
|
||||
|
|
|
@ -39,6 +39,12 @@
|
|||
Description
|
||||
.col-sm-10
|
||||
= f.text_field :description, class: 'form-control'
|
||||
.form-group
|
||||
= label_tag :job_upper_timeout, class: 'control-label' do
|
||||
Job upper timeout
|
||||
.col-sm-10
|
||||
= f.text_field :job_upper_timeout, class: 'form-control'
|
||||
.help-block This timeout will take precedence when lower than Project-defined timeout
|
||||
.form-group
|
||||
= label_tag :tag_list, class: 'control-label' do
|
||||
Tags
|
||||
|
|
|
@ -36,6 +36,8 @@
|
|||
- if runner.description.present?
|
||||
%p.runner-description
|
||||
= runner.description
|
||||
- if runner.defines_job_upper_timeout?
|
||||
%p Job upper timeout: #{runner.job_upper_timeout}
|
||||
- if runner.tag_list.present?
|
||||
%p
|
||||
- runner.tag_list.sort.each do |tag|
|
||||
|
|
|
@ -55,6 +55,9 @@
|
|||
%tr
|
||||
%td Description
|
||||
%td= @runner.description
|
||||
%tr
|
||||
%td Job upper timeout
|
||||
%td= @runner.job_upper_timeout
|
||||
%tr
|
||||
%td Last contact
|
||||
%td
|
||||
|
|
Loading…
Reference in New Issue