From cd1e6dd37c4f03f9205685eb6f7eb44713ec723e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 17 Aug 2018 05:41:53 +0000 Subject: [PATCH] doc: ci/yaml expire_in: the value is in seconds --- app/views/admin/application_settings/_ci_cd.html.haml | 2 ++ doc/ci/yaml/README.md | 4 +++- doc/user/admin_area/settings/continuous_integration.md | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 5037017e38a..97be658cd34 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -38,6 +38,8 @@ .form-text.text-muted Set the default expiration time for each job's artifacts. 0 for unlimited. + The default unit is in seconds, but you can define an alternative. For example: + 4 mins 2 sec, 2h42min. = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration') = f.submit 'Save changes', class: "btn btn-success" diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index ef740ab1c5e..abba748db8b 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1075,8 +1075,10 @@ keep artifacts forever. After their expiry, artifacts are deleted hourly by default (via a cron job), and are not accessible anymore. -The value of `expire_in` is an elapsed time. Examples of parsable values: +The value of `expire_in` is an elapsed time in seconds, unless a unit is +provided. Examples of parsable values: +- '42' - '3 mins 4 sec' - '2 hrs 20 min' - '2h20min' diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index eb6f915f3f4..76d9a4ceb03 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -21,8 +21,9 @@ that this setting is set for each job. The default expiration time of the [job artifacts][art-yml] can be set in the Admin area of your GitLab instance. The syntax of duration is described in [artifacts:expire_in][duration-syntax]. The default is `30 days`. Note that -this setting is set for each job. Set it to 0 if you don't want default -expiration. +this setting is set for each job. Set it to `0` if you don't want default +expiration. The default unit is in seconds. + 1. Go to **Admin area > Settings** (`/admin/application_settings`).