summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-08-16 14:25:44 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-08-16 14:25:44 +0000
commit71a3da05e25d3a1ea3737f762fbb34b5fb24917a (patch)
tree1fc34fefe36217b6f0154589c4b96d3588892bec
parent1f71bb4c40ddb61ffc24b9a442a70a06042df5e9 (diff)
parent79e6535a6781a403f0c59824691a202781fb505f (diff)
downloadgitlab-ce-71a3da05e25d3a1ea3737f762fbb34b5fb24917a.tar.gz
Merge branch 'add-ci_archive_traces_cron_worker-to-gitlab-yml' into 'master'
Add ci_archive_traces_cron_worker configuration to gitlab.yml.example See merge request gitlab-org/gitlab-ce!20583
-rw-r--r--changelogs/unreleased/add-ci_archive_traces_cron_worker-to-gitlab-yml.yml5
-rw-r--r--config/gitlab.yml.example3
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/add-ci_archive_traces_cron_worker-to-gitlab-yml.yml b/changelogs/unreleased/add-ci_archive_traces_cron_worker-to-gitlab-yml.yml
new file mode 100644
index 00000000000..d963dc5bac3
--- /dev/null
+++ b/changelogs/unreleased/add-ci_archive_traces_cron_worker-to-gitlab-yml.yml
@@ -0,0 +1,5 @@
+---
+title: Add an example of the configuration of archive trace cron worker in gitlab.yml.example
+merge_request: 20583
+author:
+type: other
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 561ff57c9fb..4847a82236b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -261,6 +261,9 @@ production: &base
# once per hour you will have concurrent 'git fsck' jobs.
repository_check_worker:
cron: "20 * * * *"
+ # Archive live traces which have not been archived yet
+ ci_archive_traces_cron_worker:
+ cron: "17 * * * *"
# Send admin emails once a week
admin_email_worker:
cron: "0 0 * * 0"