kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '66616-follow-up-documentation-for-merge-trains-cancel-when-running' into 'master'

Browse source 
Follow up documentation for Merge Trains cancel when running

Closes #66616

See merge request gitlab-org/gitlab-ce!32218
This commit is contained in:
Marcia Ramos 2019-09-06 08:39:57 +00:00
commit 866465f698
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/66616-follow-up-documentation-for-merge-trains-cancel-when-running.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Update merge train documentation
merge_request: 32218
author:
type: changed

14
doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
View file

@ -61,6 +61,20 @@ CAUTION: **Warning:**
Make sure your `gitlab-ci.yml` file is [configured properly for pipelines for merge requests](../index.md#configuring-pipelines-for-merge-requests),
otherwise pipelines for merged results won't run and your merge requests will be stuck in an unresolved state.
## Automatic pipeline cancelation
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/12996) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.3.
GitLab CI can detect the presence of redundant pipelines,
and will cancel them automatically in order to conserve CI resources.
When a user merges a merge request immediately within an ongoing merge
train, the train will be reconstructed, as it will recreate the expected
post-merge commit and pipeline. In this case, the merge train may already
have pipelines running against the previous expected post-merge commit.
These pipelines are considered redundant and will be automatically
canceled.
## Troubleshooting
### Pipelines for merged results not created even with new change pushed to merge request