summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-11-13 11:48:17 +0100
committerKamil Trzciński <ayufan@ayufan.eu>2018-11-13 11:48:17 +0100
commit4e811d1bde2b7ec05522ca389a3e0bf476301f1f (patch)
tree7c09ce9d447b96d5fca6d4f0fb57bf752c0c4939
parent6a66c829aac72bcc30efa2a2f33550077fb353d6 (diff)
downloadgitlab-ce-archive-builds-documentation.tar.gz
-rw-r--r--app/views/admin/application_settings/_ci_cd.html.haml9
-rw-r--r--doc/user/admin_area/settings/continuous_integration.md23
2 files changed, 16 insertions, 16 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml
index 0f0d7acf94d..0d42094fc89 100644
--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -42,11 +42,12 @@
<code>4 mins 2 sec</code>, <code>2h42min</code>.
= link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration')
.form-group
- = f.label :archive_builds_in_human_readable, 'Archive jobs in', class: 'label-bold'
+ = f.label :archive_builds_in_human_readable, 'Archive jobs', class: 'label-bold'
= f.text_field :archive_builds_in_human_readable, class: 'form-control', placeholder: 'never'
.form-text.text-muted
- Set the duration when job gonna be considered old. Archived jobs cannot be retried.
- Make it empty to never expire jobs. It has to be no less than 1 day.
- For example: <code>15 days</code>, <code>1 month</code>, <code>2 years</code>.
+ Set the duration for which the jobs will be considered as old and expired.
+ Once that time passes, the jobs will be archived and no longer able to be
+ retried. Make it empty to never expire jobs. It has to be no less than 1 day,
+ for example: <code>15 days</code>, <code>1 month</code>, <code>2 years</code>.
= f.submit 'Save changes', class: "btn btn-success"
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index 6a003482bb6..d4853a5842e 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -50,19 +50,18 @@ This setting is set per job and can be overridden in
[`.gitlab-ci.yml`](../../../ci/yaml/README.md#artifacts-expire_in).
To disable the expiration, set it to `0`. The default unit is in seconds.
-## Archive jobs in **[CORE ONLY]**
+## Archive jobs **[CORE ONLY]**
-Set this setting to enable when job gonna be considered old.
-The purpose of that feature is to reduce the CI footprint on system
-removing some of the capabilities of the jobs (metadata needed to run the build),
-but persisting the traces and artifacts to retain for auditing purposes.
+Archiving jobs is useful for reducing the CI/CD footprint on the system by
+removing some of the capabilities of the jobs (metadata needed to run the job),
+but persisting the traces and artifacts for auditing purposes.
-The archived jobs cannot be retried. Making this field empty does never expire jobs.
-The value has to be no less than 1 day. The example:
-`15 days`, `1 month`, `2 years`.
+To set the duration for which the jobs will be considered as old and expired:
-To change it:
-
-1. Go to **Admin area > Settings > Continuous Integration and Deployment**.
-1. Change the value of archive jobs in.
+1. Go to **Admin area > Settings > CI/CD > Continuous Integration and Deployment**.
+1. Change the value of "Archive jobs".
1. Hit **Save changes** for the changes to take effect.
+
+Once that time passes, the jobs will be archived and no longer able to be
+retried. Make it empty to never expire jobs. It has to be no less than 1 day,
+for example: <code>15 days</code>, <code>1 month</code>, <code>2 years</code>.