Commit f09c3244 authored by Dmitriy Zaporozhets (DZ)'s avatar Dmitriy Zaporozhets (DZ)

Merge branch 'allow_runner_runner_matchers_callsite' into 'master'

Allow runner_matchers callsite

See merge request gitlab-org/gitlab!69444
parents 360e627a 3f6b926e
...@@ -208,6 +208,7 @@ module Ci ...@@ -208,6 +208,7 @@ module Ci
Arel.sql("(#{arel_tag_names_array.to_sql})") Arel.sql("(#{arel_tag_names_array.to_sql})")
] ]
::Gitlab::Database.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/339621') do
group(*unique_params).pluck('array_agg(ci_runners.id)', *unique_params).map do |values| group(*unique_params).pluck('array_agg(ci_runners.id)', *unique_params).map do |values|
Gitlab::Ci::Matching::RunnerMatcher.new({ Gitlab::Ci::Matching::RunnerMatcher.new({
runner_ids: values[0], runner_ids: values[0],
...@@ -220,6 +221,7 @@ module Ci ...@@ -220,6 +221,7 @@ module Ci
}) })
end end
end end
end
def runner_matcher def runner_matcher
strong_memoize(:runner_matcher) do strong_memoize(:runner_matcher) do
......
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
- "./ee/spec/services/ci/minutes/refresh_cached_data_service_spec.rb" - "./ee/spec/services/ci/minutes/refresh_cached_data_service_spec.rb"
- "./ee/spec/services/ci/pipeline_creation/drop_not_runnable_builds_service_spec.rb" - "./ee/spec/services/ci/pipeline_creation/drop_not_runnable_builds_service_spec.rb"
- "./ee/spec/services/ci/process_pipeline_service_spec.rb" - "./ee/spec/services/ci/process_pipeline_service_spec.rb"
- "./ee/spec/services/ci/retry_build_service_spec.rb"
- "./ee/spec/services/ci/retry_pipeline_service_spec.rb" - "./ee/spec/services/ci/retry_pipeline_service_spec.rb"
- "./ee/spec/services/ci/trigger_downstream_subscription_service_spec.rb" - "./ee/spec/services/ci/trigger_downstream_subscription_service_spec.rb"
- "./ee/spec/services/clear_namespace_shared_runners_minutes_service_spec.rb" - "./ee/spec/services/clear_namespace_shared_runners_minutes_service_spec.rb"
...@@ -331,7 +330,6 @@ ...@@ -331,7 +330,6 @@
- "./spec/services/ci/pipeline_processing/shared_processing_service_tests_with_yaml.rb" - "./spec/services/ci/pipeline_processing/shared_processing_service_tests_with_yaml.rb"
- "./spec/services/ci/play_build_service_spec.rb" - "./spec/services/ci/play_build_service_spec.rb"
- "./spec/services/ci/register_job_service_spec.rb" - "./spec/services/ci/register_job_service_spec.rb"
- "./spec/services/ci/retry_build_service_spec.rb"
- "./spec/services/ci/retry_pipeline_service_spec.rb" - "./spec/services/ci/retry_pipeline_service_spec.rb"
- "./spec/services/ci/update_build_queue_service_spec.rb" - "./spec/services/ci/update_build_queue_service_spec.rb"
- "./spec/services/clusters/applications/prometheus_config_service_spec.rb" - "./spec/services/clusters/applications/prometheus_config_service_spec.rb"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment