diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 1f6f156922854c665d0117f32e8ddf4d7625b7d4_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..1c7f0761b5395199f6a6ab5b3db773cf6494f67c_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -194,6 +194,8 @@ # gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "@daily" # gitlab_rails['ci_runners_stale_machines_cleanup_worker_cron'] = "36 * * * *" # gitlab_rails['ci_catalog_resources_process_sync_events_worker_cron'] = "*/1 * * * *" +# gitlab_rails['ci_click_house_finished_pipelines_sync_worker_cron'] = "*/4 * * * *" +# gitlab_rails['ci_click_house_finished_pipelines_sync_worker_args'] = [1] ### 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 1f6f156922854c665d0117f32e8ddf4d7625b7d4_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..1c7f0761b5395199f6a6ab5b3db773cf6494f67c_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -152,6 +152,8 @@ default['gitlab']['gitlab_rails']['incoming_email_auth_token'] = nil default['gitlab']['gitlab_rails']['click_house_ci_finished_builds_sync_worker_cron'] = nil default['gitlab']['gitlab_rails']['click_house_ci_finished_builds_sync_worker_args'] = nil +default['gitlab']['gitlab_rails']['ci_click_house_finished_pipelines_sync_worker_cron'] = nil +default['gitlab']['gitlab_rails']['ci_click_house_finished_pipelines_sync_worker_args'] = nil default['gitlab']['gitlab_rails']['service_desk_email_enabled'] = false default['gitlab']['gitlab_rails']['service_desk_email_address'] = nil diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 1f6f156922854c665d0117f32e8ddf4d7625b7d4_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI=..1c7f0761b5395199f6a6ab5b3db773cf6494f67c_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -609,6 +609,15 @@ cron: "<%= @ci_catalog_resources_process_sync_events_worker_cron %>" <% end %> + # Periodically sync finished pipelines from p_ci_finished_pipeline_ch_sync_events to ClickHouse + <% unless @ci_click_house_finished_pipelines_sync_worker_cron.nil? %> + ci_click_house_finished_pipelines_sync_worker: + cron: "<%= @ci_click_house_finished_pipelines_sync_worker_cron %>" + <% unless @ci_click_house_finished_pipelines_sync_worker_args.nil? %> + args: <%= @ci_click_house_finished_pipelines_sync_worker_args %> + <% end %> + <% 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 1f6f156922854c665d0117f32e8ddf4d7625b7d4_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWIvcmVjaXBlcy9naXRsYWItcmFpbHMvZ2l0bGFiX3ltbC9jcm9uX2pvYnNfc3BlYy5yYg==..1c7f0761b5395199f6a6ab5b3db773cf6494f67c_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 @@ -54,6 +54,7 @@ 'ci_runners_stale_machines_cleanup_worker' | 'ci_runners_stale_machines_cleanup_worker_cron' 'click_house_ci_finished_builds_sync_worker' | 'click_house_ci_finished_builds_sync_worker_cron' 'ci_catalog_resources_process_sync_events_worker' | 'ci_catalog_resources_process_sync_events_worker_cron' + 'ci_click_house_finished_pipelines_sync_worker' | 'ci_click_house_finished_pipelines_sync_worker_cron' end with_them do