Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fc25d3a2
Commit
fc25d3a2
authored
Nov 15, 2019
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the default concurrency on merge train
This commit changes the default concurrency on merge train
parent
264290e7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
changelogs/unreleased/change-default-factor-on-merge-train.yml
...elogs/unreleased/change-default-factor-on-merge-train.yml
+5
-0
doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md
...elines/pipelines_for_merged_results/merge_trains/index.md
+2
-2
ee/app/services/merge_trains/refresh_merge_requests_service.rb
...p/services/merge_trains/refresh_merge_requests_service.rb
+1
-1
No files found.
changelogs/unreleased/change-default-factor-on-merge-train.yml
0 → 100644
View file @
fc25d3a2
---
title
:
Change the default concurrency factor of merge train to
20
merge_request
:
20201
author
:
type
:
changed
doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md
View file @
fc25d3a2
...
@@ -32,8 +32,8 @@ Merge trains have the following requirements and limitations:
...
@@ -32,8 +32,8 @@ Merge trains have the following requirements and limitations:
-
This feature requires that
-
This feature requires that
[
pipelines for merged results
](
../index.md#pipelines-for-merged-results-premium
)
are
[
pipelines for merged results
](
../index.md#pipelines-for-merged-results-premium
)
are
**configured properly**
.
**configured properly**
.
-
Each merge train can run a maximum of
**
four
**
pipelines in parallel.
-
Each merge train can run a maximum of
**
twenty
**
pipelines in parallel.
If more than
four
merge requests are added to the merge train, the merge requests
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
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.
number of merge requests that can be queued.
-
This feature does not support
[
squash and merge
](
../../../../user/project/merge_requests/squash_and_merge.md
)
.
-
This feature does not support
[
squash and merge
](
../../../../user/project/merge_requests/squash_and_merge.md
)
.
...
...
ee/app/services/merge_trains/refresh_merge_requests_service.rb
View file @
fc25d3a2
...
@@ -70,7 +70,7 @@ module MergeTrains
...
@@ -70,7 +70,7 @@ module MergeTrains
def
max_concurrency
def
max_concurrency
strong_memoize
(
:max_concurrency
)
do
strong_memoize
(
:max_concurrency
)
do
if
Feature
.
enabled?
(
:merge_trains_parallel_pipelines
,
project
,
default_enabled:
true
)
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
HIGH_CONCURRENCY
elsif
Feature
.
enabled?
(
:merge_trains_medium_concurrency
,
project
)
elsif
Feature
.
enabled?
(
:merge_trains_medium_concurrency
,
project
)
MEDIUM_CONCURRENCY
MEDIUM_CONCURRENCY
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment