diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-06-11 13:37:47 +0200 |
|---|---|---|
| committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-09-15 21:39:26 +0200 |
| commit | 4b6619cfd3ca127d728d7277cac3da8ed54b99b0 (patch) | |
| tree | b590ee77d626f085443ffd9ea3b08c03078e5448 /app/models/ci/runner.rb | |
| parent | 65caacc600bc0a507a313e8be45021512260906e (diff) | |
| download | gitlab-ce-4b6619cfd3ca127d728d7277cac3da8ed54b99b0.tar.gz | |
add type param to runners api
Diffstat (limited to 'app/models/ci/runner.rb')
| -rw-r--r-- | app/models/ci/runner.rb | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index eabb41c29d7..043f03b7873 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -8,12 +8,24 @@ module Ci include RedisCacheable include ChronicDurationAttribute + enum access_level: { + not_protected: 0, + ref_protected: 1 + } + + enum runner_type: { + instance_type: 1, + group_type: 2, + project_type: 3 + } + RUNNER_QUEUE_EXPIRY_TIME = 60.minutes ONLINE_CONTACT_TIMEOUT = 1.hour UPDATE_DB_RUNNER_INFO_EVERY = 40.minutes - AVAILABLE_TYPES = %w[specific shared].freeze + AVAILABLE_TYPES_LEGACY = %w[specific shared].freeze + AVAILABLE_TYPES = runner_types.keys.freeze AVAILABLE_STATUSES = %w[active paused online offline].freeze - AVAILABLE_SCOPES = (AVAILABLE_TYPES + AVAILABLE_STATUSES).freeze + AVAILABLE_SCOPES = (AVAILABLE_TYPES_LEGACY + AVAILABLE_TYPES + AVAILABLE_STATUSES).freeze FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level maximum_timeout_human_readable].freeze ignore_column :is_shared @@ -88,17 +100,6 @@ module Ci after_destroy :cleanup_runner_queue - enum access_level: { - not_protected: 0, - ref_protected: 1 - } - - enum runner_type: { - instance_type: 1, - group_type: 2, - project_type: 3 - } - cached_attr_reader :version, :revision, :platform, :architecture, :ip_address, :contacted_at chronic_duration_attr :maximum_timeout_human_readable, :maximum_timeout |