From 0260e13629dfdf52f2d23c7af3c3234dab0b2309 Mon Sep 17 00:00:00 2001 From: Darby Frey Date: Mon, 17 Jun 2019 13:09:09 -0500 Subject: [PATCH 1/2] Updated docs for Merge Trains --- doc/ci/merge_request_pipelines/index.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index d8c1cefc8df..76e43dfb170 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -124,7 +124,7 @@ otherwise pipelines for merged results won't run and your merge requests will be ## Merge Trains **[PREMIUM]** > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.0. -> This feature is disabled by default until we resolve issues with [contention handling](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222), but [can be enabled manually](#enabling-merge-trains). +> This feature is disabled by default, but [can be enabled manually](#enabling-merge-trains). Please be aware of [current limitations](#merge-trains-limitations). [Pipelines for merged results](#pipelines-for-merged-results-premium) introduces running a build on the result of the merged code prior to merging, as a way to keep master green. @@ -143,8 +143,7 @@ it creates a new pipeline targeting the merge result of the previous MR plus the Pipelines invalidated through failures are immediately canceled and requeued. CAUTION: **Warning:** -At this moment, each merge train can generate a merge ref and run a pipeline **one at a time** due to a technical challenge. -We have [an issue](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) to tackle this problem to make the pipelines for merged results run in parallel. +At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release. ### Enabling Merge Trains @@ -188,8 +187,7 @@ button while the latest pipeline is running. ### Merge Train's limitations -- At this moment, each merge train can generate a merge ref and run a pipeline **one at a time** due to a technical challenge. - We have [an issue](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) to tackle this problem to make the pipelines for merged results run in parallel. +- At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release. ## Excluding certain jobs From 30efffe38b32e83b49d106a1bd735fb6ee388961 Mon Sep 17 00:00:00 2001 From: Darby Frey Date: Mon, 17 Jun 2019 17:16:13 -0500 Subject: [PATCH 2/2] Updated docs with suggested changes --- doc/ci/merge_request_pipelines/index.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 76e43dfb170..5adb7ebd30d 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -124,7 +124,7 @@ otherwise pipelines for merged results won't run and your merge requests will be ## Merge Trains **[PREMIUM]** > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.0. -> This feature is disabled by default, but [can be enabled manually](#enabling-merge-trains). Please be aware of [current limitations](#merge-trains-limitations). +> This feature is disabled by default, but [can be enabled manually](#enabling-merge-trains). [Pipelines for merged results](#pipelines-for-merged-results-premium) introduces running a build on the result of the merged code prior to merging, as a way to keep master green. @@ -142,7 +142,7 @@ If the button is subsequently pressed in a different MR, instead of creating a n it creates a new pipeline targeting the merge result of the previous MR plus the target branch. Pipelines invalidated through failures are immediately canceled and requeued. -CAUTION: **Warning:** +CAUTION: **Caution:** At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release. ### Enabling Merge Trains @@ -185,10 +185,6 @@ button while the latest pipeline is running. ![Add to merge train when pipeline succeeds](img/merge_train_start_when_pipeline_succeeds.png) -### Merge Train's limitations - -- At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release. - ## Excluding certain jobs The behavior of the `only: merge_requests` parameter is such that _only_ jobs with