Skip to content
Snippets Groups Projects
Commit b400bea6 authored by Ash McKenzie's avatar Ash McKenzie :two:
Browse files

Merge branch 'change-default-factor-on-merge-train' into 'master'

Change the default concurrency on merge train

Closes #31692

See merge request !20201
parents 063f33f3 fc25d3a2
No related branches found
No related tags found
1 merge request!20201Change the default concurrency on merge train
Pipeline #96103930 failed
---
title: Change the default concurrency factor of merge train to 20
merge_request: 20201
author:
type: changed
......@@ -32,8 +32,8 @@ 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 run a maximum of **four** pipelines in parallel.
If more than four merge requests are added to the merge train, the merge requests
- Each merge train can run a maximum of **twenty** pipelines in parallel.
If more than twenty 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).
......
......@@ -70,7 +70,7 @@ def queue_id(merge_request)
def max_concurrency
strong_memoize(:max_concurrency) do
if Feature.enabled?(:merge_trains_parallel_pipelines, project, default_enabled: true)
if Feature.enabled?(:merge_trains_high_concurrency, project)
if Feature.enabled?(:merge_trains_high_concurrency, project, default_enabled: true)
HIGH_CONCURRENCY
elsif Feature.enabled?(:merge_trains_medium_concurrency, project)
MEDIUM_CONCURRENCY
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment