Merge branch 'zj-rename-trigger-schedules-pipeline-schedules' into 'master'

Rename Trigger schedule to Pipeline Schedule

See merge request !1546

CHANGELOG.md

@@ -17,6 +17,7 @@ omnibus-gitlab repository.
 - Generate license .csv file 5478b1aa
 - Generate PO translation files 6b6c936a
 - Change service running detection 18b51873
+- Rename trigger schedules to pipeline schedules
 - Compile new binaries for gitlab-shell
 9.1.2

files/gitlab-config-template/gitlab.rb.template

@@ -82,7 +82,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 ###!       https://docs.gitlab.com/ce/ci/yaml/README.html#artifacts:expire_in
 # gitlab_rails['stuck_ci_jobs_worker_cron'] = "0 0 * * *"
 # gitlab_rails['expire_build_artifacts_worker_cron'] = "50 * * * *"
-# gitlab_rails['trigger_schedule_worker_cron'] = "0 */12 * * *"
+# gitlab_rails['pipeline_schedule_worker_cron'] = "41 * * * *"
 # gitlab_rails['repository_check_worker_cron'] = "20 * * * *"
 # gitlab_rails['admin_email_worker_cron'] = "0 0 * * 0"
 # gitlab_rails['repository_archive_cache_worker_cron'] = "0 * * * *"

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -103,7 +103,7 @@ default['gitlab']['gitlab-rails']['gravatar_plain_url'] = nil
 default['gitlab']['gitlab-rails']['gravatar_ssl_url'] = nil
 default['gitlab']['gitlab-rails']['stuck_ci_jobs_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['expire_build_artifacts_worker_cron'] = nil
-default['gitlab']['gitlab-rails']['trigger_schedule_worker_cron'] = nil
+default['gitlab']['gitlab-rails']['pipeline_schedule_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['repository_check_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['admin_email_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['repository_archive_cache_worker_cron'] = nil

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -172,8 +172,8 @@ production: &base
     expire_build_artifacts_worker:
       cron: "<%= @expire_build_artifacts_worker_cron %>"
     # Schedule pipelines in the near future
-    trigger_schedule_worker:
-      cron: "<%= @trigger_schedule_worker_cron %>"
+    pipeline_schedule_worker:
+      cron: "<%= @pipeline_schedule_worker_cron %>"
     # Periodically run 'git fsck' on all repositories. If started more than
     # once per hour you will have concurrent 'git fsck' jobs.
     repository_check_worker:

spec/chef/recipes/gitlab-rails_spec.rb

@@ -213,10 +213,10 @@ describe 'gitlab::gitlab-rails' do
     context 'Scheduled Pipeline settings' do
       context 'when the corn pattern is configured' do
         it 'sets the cron value' do
-          stub_gitlab_rb(gitlab_rails: { trigger_schedule_worker_cron: '1 2 3 4 5' })
+          stub_gitlab_rb(gitlab_rails: { pipeline_schedule_worker_cron: '41 * * * *' })
           expect(chef_run).to render_file(gitlab_yml_path)
-            .with_content(/trigger_schedule_worker:\s+cron:\s+"1 2 3 4 5"/)
+            .with_content(/pipeline_schedule_worker:\s+cron:\s+"41/)
         end
       end