diff options
| author | Marcia Ramos <marcia@gitlab.com> | 2019-09-06 08:39:57 +0000 |
|---|---|---|
| committer | Marcia Ramos <marcia@gitlab.com> | 2019-09-06 08:39:57 +0000 |
| commit | 866465f6985d889c02a922a9b02c0803bb0be840 (patch) | |
| tree | 9418359310dc71e0d51fdd2acaf1d5becbd4e729 | |
| parent | a1d099a70f2d8373da8951d58c3a3a769ca85f32 (diff) | |
| parent | 1e0867de363cc7992cdc1738ee42d6d105257b0a (diff) | |
| download | gitlab-ce-866465f6985d889c02a922a9b02c0803bb0be840.tar.gz | |
Merge branch '66616-follow-up-documentation-for-merge-trains-cancel-when-running' into 'master'
Follow up documentation for Merge Trains cancel when running
Closes #66616
See merge request gitlab-org/gitlab-ce!32218
| -rw-r--r-- | changelogs/unreleased/66616-follow-up-documentation-for-merge-trains-cancel-when-running.yml | 5 | ||||
| -rw-r--r-- | doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/changelogs/unreleased/66616-follow-up-documentation-for-merge-trains-cancel-when-running.yml b/changelogs/unreleased/66616-follow-up-documentation-for-merge-trains-cancel-when-running.yml new file mode 100644 index 00000000000..54bec43815c --- /dev/null +++ b/changelogs/unreleased/66616-follow-up-documentation-for-merge-trains-cancel-when-running.yml @@ -0,0 +1,5 @@ +--- +title: Update merge train documentation +merge_request: 32218 +author: +type: changed diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md index 126e12e460f..d68fba82f4b 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md @@ -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 |