Skip to content
Snippets Groups Projects
Commit d5209202 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'ci-platform-metrics-omnibus' into 'master'

Adds CI Platform Metrics bookkeeping omnibus

See merge request gitlab-org/omnibus-gitlab!4526
parents ee5a182d c2f8cf57
No related branches found
No related tags found
No related merge requests found
---
title: Cron worker settings for CI platform target metrics.
merge_request: 4526
author:
type: other
Loading
Loading
@@ -144,6 +144,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_rails['pages_domain_ssl_renewal_cron_worker'] = "*/10 * * * *"
# gitlab_rails['pages_domain_removal_cron_worker'] = "47 0 * * *"
# gitlab_rails['schedule_migrate_external_diffs_worker_cron'] = "15 * * * *"
# gitlab_rails['ci_platform_metrics_update_cron_worker'] = '47 9 * * *'
 
### Webhook Settings
###! Number of seconds to wait for HTTP response after sending webhook HTTP POST
Loading
Loading
Loading
Loading
@@ -128,6 +128,7 @@ default['gitlab']['gitlab-rails']['pages_domain_verification_cron_worker'] = nil
default['gitlab']['gitlab-rails']['pages_domain_ssl_renewal_cron_worker'] = nil
default['gitlab']['gitlab-rails']['pages_domain_removal_cron_worker'] = nil
default['gitlab']['gitlab-rails']['schedule_migrate_external_diffs_worker_cron'] = nil
default['gitlab']['gitlab-rails']['ci_platform_metrics_update_cron_worker'] = nil
default['gitlab']['gitlab-rails']['historical_data_worker_cron'] = nil
default['gitlab']['gitlab-rails']['ldap_sync_worker_cron'] = nil
default['gitlab']['gitlab-rails']['ldap_group_sync_worker_cron'] = nil
Loading
Loading
Loading
Loading
@@ -401,6 +401,10 @@ production: &base
schedule_migrate_external_diffs_worker:
cron:<% if @schedule_migrate_external_diffs_worker_cron %> "<%= @schedule_migrate_external_diffs_worker_cron %>"<% end %>
 
# Update CI Platform Metrics daily
ci_platform_metrics_update_cron_worker:
cron: <% if @ci_platform_metrics_update_cron_worker %> "<%= @ci_platform_metrics_update_cron_worker %>"<% end %>
##
# GitLab EE only jobs:
 
Loading
Loading
Loading
Loading
@@ -2085,6 +2085,30 @@ RSpec.describe 'gitlab::gitlab-rails' do
end
end
 
context 'Update CI Platform Metrics daily cron job settings' do
context 'when the cron pattern is configured' do
it 'sets the value' do
stub_gitlab_rb(gitlab_rails: { ci_platform_metrics_update_cron_worker: '47 9 * * *' })
expect(chef_run).to create_templatesymlink('Create a gitlab.yml and create a symlink to Rails root').with_variables(
hash_including(
'ci_platform_metrics_update_cron_worker' => '47 9 * * *'
)
)
end
end
context 'when the cron pattern is not configured' do
it ' sets no value' do
expect(chef_run).to create_templatesymlink('Create a gitlab.yml and create a symlink to Rails root').with_variables(
hash_including(
'ci_platform_metrics_update_cron_worker' => nil
)
)
end
end
end
context 'Geo settings' do
it 'sets the geo_node_name variable' do
stub_gitlab_rb(gitlab_rails: { geo_node_name: 'the name of the node' })
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment