Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-06 06:10:25 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-06 06:10:25 +0300
commit806b829e76120085d80759dabc110f0328cfb7ac (patch)
treef8fff9251baabf1974cf879c456903ba8fe5059d /doc/ci/pipelines
parentbfb0d93c767b4df4ab31a836d40cd7a1657916b5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/pipelines')
-rw-r--r--doc/ci/pipelines/job_artifacts.md5
-rw-r--r--doc/ci/pipelines/pipeline_artifacts.md3
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md
index fa97f9bd75d..fa5da1f6a11 100644
--- a/doc/ci/pipelines/job_artifacts.md
+++ b/doc/ci/pipelines/job_artifacts.md
@@ -173,9 +173,8 @@ https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/file/htmlcov/index.
## When job artifacts are deleted
-By default, the latest job artifacts from the most recent successful jobs are never deleted.
-If a job is configured with [`expire_in`](../yaml/README.md#artifactsexpire_in),
-its artifacts only expire if a more recent artifact exists.
+See the [`expire_in`](../yaml/README.md#artifactsexpire_in) documentation for information on when
+job artifacts are deleted.
### Keep artifacts from most recent successful jobs
diff --git a/doc/ci/pipelines/pipeline_artifacts.md b/doc/ci/pipelines/pipeline_artifacts.md
index fca6c039653..bc770dd3d90 100644
--- a/doc/ci/pipelines/pipeline_artifacts.md
+++ b/doc/ci/pipelines/pipeline_artifacts.md
@@ -17,4 +17,5 @@ Pipeline artifacts are saved to disk or object storage. They count towards a pro
## When pipeline artifacts are deleted
-The latest artifacts for refs are locked against deletion, and kept regardless of the expiry time.
+See the [`expire_in`](../yaml/README.md#artifactsexpire_in) documentation for information on when
+pipeline artifacts are deleted.