diff options
Diffstat (limited to 'app/models/ci/runner.rb')
| -rw-r--r-- | app/models/ci/runner.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 71110ef0696..a541dca47de 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -13,7 +13,7 @@ module Ci include Gitlab::Utils::StrongMemoize include TaggableQueries - add_authentication_token_field :token, encrypted: -> { Feature.enabled?(:ci_runners_tokens_optional_encryption, default_enabled: true) ? :optional : :required } + add_authentication_token_field :token, encrypted: :optional enum access_level: { not_protected: 0, @@ -214,15 +214,15 @@ module Ci Arel.sql("(#{arel_tag_names_array.to_sql})") ] - # we use distinct to de-duplicate data - distinct.pluck(*unique_params).map do |values| + group(*unique_params).pluck('array_agg(ci_runners.id)', *unique_params).map do |values| Gitlab::Ci::Matching::RunnerMatcher.new({ - runner_type: values[0], - public_projects_minutes_cost_factor: values[1], - private_projects_minutes_cost_factor: values[2], - run_untagged: values[3], - access_level: values[4], - tag_list: values[5] + runner_ids: values[0], + runner_type: values[1], + public_projects_minutes_cost_factor: values[2], + private_projects_minutes_cost_factor: values[3], + run_untagged: values[4], + access_level: values[5], + tag_list: values[6] }) end end @@ -230,6 +230,7 @@ module Ci def runner_matcher strong_memoize(:runner_matcher) do Gitlab::Ci::Matching::RunnerMatcher.new({ + runner_ids: [id], runner_type: runner_type, public_projects_minutes_cost_factor: public_projects_minutes_cost_factor, private_projects_minutes_cost_factor: private_projects_minutes_cost_factor, |