From ec7f5672dfe4606be08d14520bfc08e50c6fffb9 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 19 Jul 2019 09:40:23 +0000 Subject: [PATCH] Documentations for parallel execution strategy for Merge Trains This commit adds a documentation for parallel pipelines on merge trains. Fix typo --- .../pipelines_for_merged_results/index.md | 9 ++-- .../img/merge_train_position_v12_0.png | Bin 0 -> 18121 bytes .../merge_trains/index.md | 39 ++++++++++-------- 3 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_position_v12_0.png 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 a13857bee25..f63b17a9e5a 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 @@ -6,7 +6,6 @@ last_update: 2019-07-03 # Pipelines for Merged Results **(PREMIUM)** > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/7380) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.10. -> 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-pipelines-for-merged-results). It's possible for your source and target branches to diverge, which can result in the scenario that source branch's pipeline was green, the target's pipeline was green, @@ -25,8 +24,10 @@ new ref and a pipeline for this ref validates the result prior to merging. There are some cases where creating a combined ref is not possible or not wanted. For example, a source branch that has conflicts with the target branch -or a merge request that is still in WIP status. In this case, the merge request pipeline falls back to a "detached" state -and runs on the source branch ref as if it was a regular pipeline. +or a merge request that is still in WIP status. In this case, +GitLab doesn't create a merge commit and the pipeline runs on source branch, instead, +which is a default behavior of [Pipelines for merge requests](../index.md) + i.e. `detached` label is shown to the pipelines. The detached state serves to warn you that you are working in a situation subjected to merge problems, and helps to highlight that you should @@ -42,7 +43,7 @@ Pipelines for merged results require: In addition, pipelines for merged results have the following limitations: - Forking/cross-repo workflows are not currently supported. To follow progress, - see [#9713](https://gitlab.com/gitlab-org/gitlab-ee/issues/9713). + see [#11934](https://gitlab.com/gitlab-org/gitlab-ee/issues/11934). - This feature is not available for [fast forward merges](../../../user/project/merge_requests/fast_forward_merge.md) yet. To follow progress, see [#58226](https://gitlab.com/gitlab-org/gitlab-ce/issues/58226). diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_position_v12_0.png b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_position_v12_0.png new file mode 100644 index 0000000000000000000000000000000000000000..70916bc0e00d227be96685b7f2649f4df644bda4 GIT binary patch literal 18121 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 literal 0 HcmV?d00001 diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md index 57358434c02..44cbcde264c 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md @@ -6,7 +6,6 @@ last_update: 2019-07-03 # 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). [Pipelines for merged results](../index.md#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. @@ -33,35 +32,40 @@ Merge trains have the following requirements and limitations: - This feature requires that [pipelines for merged results](../index.md#pipelines-for-merged-results-premium) are **configured properly**. -- 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. +- Each merge train can run a maximum of **four** pipelines in parallel. + If more than four merge requests are added to the merge train, the merge requests + will be queued until a slot in the merge train is free. There is no limit to the + number of merge requests that can be queued. +- This feature does not support [squash and merge](../../../../user/project/merge_requests/squash_and_merge.md). -## Enabling Merge Trains - -To enable merge trains at the project level: - -1. Visit your project's **Settings > General** and expand **Merge requests**. -1. Check **Allow merge trains**. -1. Click **Save changes** button. - -![Merge request pipeline config](img/merge_train_config_v12_0.png) + +Watch this video for a demonstration on [how parallel execution +of Merge Trains can prevent commits from breaking the default +branch](https://www.youtube.com/watch?v=D4qCqXgZkHQ). ## How to add a merge request to a merge train To add a merge request to a merge train: -1. Click "Start/Add merge train" button in a merge request +1. Visit a merge request. +1. Click the **Start/Add to merge train** button. ![Start merge train](img/merge_train_start_v12_0.png) ## How to remove a merge request from a merge train -1. Click "Remove from merge train" button in the merge request widget. +1. Visit a merge request. +1. Click the **Remove from merge train** button. ![Cancel merge train](img/merge_train_cancel_v12_0.png) +## How to view a merge request's current position on the merge train + +After a merge request has been added to the merge train, the merge request's +current position will be displayed under the pipeline widget: + +![Merge train position indicator](img/merge_train_position_v12_0.png) + ## Start/Add to merge train when pipeline succeeds You can add a merge request to a merge train only when the latest pipeline in the @@ -70,7 +74,8 @@ the merge request to a train because the current change of the merge request may be broken thus it could affect the following merge requests. In this case, you can schedule to add the merge request to a merge train **when the latest -pipeline succeeds**. You can see the following button instead of the regular "Start/Add merge train" +pipeline succeeds** (This pipeline is [Pipelines for merged results](../index.md), not Pipelines for merge train). +You can see the following button instead of the regular **Start/Add to merge train** button while the latest pipeline is running. ![Add to merge train when pipeline succeeds](img/merge_train_start_when_pipeline_succeeds_v12_0.png)