diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 6644b7645a9c910e0492c2ca9cad331453a805f5_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..7263ff173ec769a68871949cc3c97eadbd4f255f_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -184,6 +184,7 @@ # gitlab_rails['ssh_keys_expired_notification_worker_cron'] = "0 2 * * *" # gitlab_rails['ssh_keys_expiring_soon_notification_worker_cron'] = "0 1 * * *" # gitlab_rails['loose_foreign_keys_cleanup_worker_cron'] = "*/5 * * * *" +# gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "20 * * * *" ### Webhook Settings ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 6644b7645a9c910e0492c2ca9cad331453a805f5_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..7263ff173ec769a68871949cc3c97eadbd4f255f_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -183,6 +183,7 @@ 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 +default['gitlab']['gitlab-rails']['ci_runner_versions_reconciliation_worker_cron'] = nil # Consolidated object storage config default['gitlab']['gitlab-rails']['object_store']['enabled'] = false diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 6644b7645a9c910e0492c2ca9cad331453a805f5_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI=..7263ff173ec769a68871949cc3c97eadbd4f255f_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -550,6 +550,12 @@ cron: "<%= @loose_foreign_keys_cleanup_worker_cron %>" <% end %> + # Periodically update ci_runner_versions table with up-to-date versions and status + <% unless @ci_runner_versions_reconciliation_worker_cron.nil? %> + ci_runner_versions_reconciliation_worker: + cron: "<%= @ci_runner_versions_reconciliation_worker_cron %>" + <% end %> + ## # GitLab EE only jobs: diff --git a/spec/chef/cookbooks/gitlab/recipes/gitlab-rails/gitlab_yml/cron_jobs_spec.rb b/spec/chef/cookbooks/gitlab/recipes/gitlab-rails/gitlab_yml/cron_jobs_spec.rb index 6644b7645a9c910e0492c2ca9cad331453a805f5_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWIvcmVjaXBlcy9naXRsYWItcmFpbHMvZ2l0bGFiX3ltbC9jcm9uX2pvYnNfc3BlYy5yYg==..7263ff173ec769a68871949cc3c97eadbd4f255f_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWIvcmVjaXBlcy9naXRsYWItcmFpbHMvZ2l0bGFiX3ltbC9jcm9uX2pvYnNfc3BlYy5yYg== 100644 --- a/spec/chef/cookbooks/gitlab/recipes/gitlab-rails/gitlab_yml/cron_jobs_spec.rb +++ b/spec/chef/cookbooks/gitlab/recipes/gitlab-rails/gitlab_yml/cron_jobs_spec.rb @@ -50,6 +50,7 @@ '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' + 'ci_runner_versions_reconciliation_worker' | 'ci_runner_versions_reconciliation_worker_cron' end with_them do