Commit bb514bfd authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'pedropombeiro/361112/add-runners-prune-worker-cron' into 'master'

Add ci_runners_stale_group_runners_prune_worker_cron setting

See merge request !6094
parents 2b642dae 4fe5c082
......@@ -2508,6 +2508,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"
# gitlab_rails['elastic_index_bulk_cron'] = "*/1 * * * *"
# gitlab_rails['analytics_devops_adoption_create_all_snapshots_worker_cron'] = "0 4 * * 0"
# gitlab_rails['ci_runners_stale_group_runners_prune_worker_cron'] = "30 * * * *"
################################################################################
## Kerberos (EE Only)
......
......@@ -182,6 +182,8 @@ default['gitlab']['gitlab-rails']['namespaces_in_product_marketing_emails_worker
default['gitlab']['gitlab-rails']['ssh_keys_expired_notification_worker_cron'] = nil
default['gitlab']['gitlab-rails']['ssh_keys_expiring_soon_notification_worker_cron'] = nil
default['gitlab']['gitlab-rails']['ci_runners_stale_group_runners_prune_worker_cron'] = nil
# Consolidated object storage config
default['gitlab']['gitlab-rails']['object_store']['enabled'] = false
default['gitlab']['gitlab-rails']['object_store']['connection'] = {}
......
......@@ -661,6 +661,12 @@ production: &base
cron: "<%= @namespaces_in_product_marketing_emails_worker_cron %>"
<% end %>
# Worker for pruning stale group runners on opted-in namespaces
<% unless @ci_runners_stale_group_runners_prune_worker_cron.nil? %>
ci_runners_stale_group_runners_prune_worker_cron:
cron: "<%= @ci_runners_stale_group_runners_prune_worker_cron %>"
<% end %>
## Geo
# NOTE: These settings will only take effect if Geo is enabled
geo:
......
......@@ -50,6 +50,7 @@ RSpec.describe 'gitlab::gitlab-rails' do
'ssh_keys_expired_notification_worker' | 'ssh_keys_expired_notification_worker_cron'
'ssh_keys_expiring_soon_notification_worker' | 'ssh_keys_expiring_soon_notification_worker_cron'
'loose_foreign_keys_cleanup_worker' | 'loose_foreign_keys_cleanup_worker_cron'
'ci_runners_stale_group_runners_prune_worker_cron' | 'ci_runners_stale_group_runners_prune_worker_cron'
end
with_them do
......
Supports Markdown
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