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
088e30ae
Commit
088e30ae
authored
Aug 05, 2020
by
Marius Bobin
Committed by
Robert Speicher
Aug 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_parallel_matrix_enabled feature flag
Enables ci_parallel_matrix_enabled feature flag by removing it
parent
939b05db
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
14 deletions
+2
-14
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+0
-4
lib/gitlab/ci/config/entry/product/parallel.rb
lib/gitlab/ci/config/entry/product/parallel.rb
+1
-1
lib/gitlab/ci/config/normalizer/factory.rb
lib/gitlab/ci/config/normalizer/factory.rb
+1
-5
lib/gitlab/ci/features.rb
lib/gitlab/ci/features.rb
+0
-4
No files found.
doc/ci/yaml/README.md
View file @
088e30ae
...
@@ -3473,10 +3473,6 @@ job split into three separate jobs.
...
@@ -3473,10 +3473,6 @@ job split into three separate jobs.
#### Parallel `matrix` jobs
#### Parallel `matrix` jobs
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15356) in GitLab 13.3.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15356) in GitLab 13.3.
> - It's deployed behind a feature flag, disabled by default.
> - It's enabled on GitLab.com.
> - It can't be enabled or disabled per-project.
> - It's recommended for production use.
`matrix:`
allows you to configure different variables for jobs that are running in parallel.
`matrix:`
allows you to configure different variables for jobs that are running in parallel.
There can be from 2 to 50 jobs.
There can be from 2 to 50 jobs.
...
...
lib/gitlab/ci/config/entry/product/parallel.rb
View file @
088e30ae
...
@@ -10,7 +10,7 @@ module Gitlab
...
@@ -10,7 +10,7 @@ module Gitlab
module
Product
module
Product
class
Parallel
<
::
Gitlab
::
Config
::
Entry
::
Simplifiable
class
Parallel
<
::
Gitlab
::
Config
::
Entry
::
Simplifiable
strategy
:ParallelBuilds
,
if:
->
(
config
)
{
config
.
is_a?
(
Numeric
)
}
strategy
:ParallelBuilds
,
if:
->
(
config
)
{
config
.
is_a?
(
Numeric
)
}
strategy
:MatrixBuilds
,
if:
->
(
config
)
{
::
Gitlab
::
Ci
::
Features
.
parallel_matrix_enabled?
&&
config
.
is_a?
(
Hash
)
}
strategy
:MatrixBuilds
,
if:
->
(
config
)
{
config
.
is_a?
(
Hash
)
}
PARALLEL_LIMIT
=
50
PARALLEL_LIMIT
=
50
...
...
lib/gitlab/ci/config/normalizer/factory.rb
View file @
088e30ae
...
@@ -29,11 +29,7 @@ module Gitlab
...
@@ -29,11 +29,7 @@ module Gitlab
end
end
def
strategies
def
strategies
if
::
Gitlab
::
Ci
::
Features
.
parallel_matrix_enabled?
[
NumberStrategy
,
MatrixStrategy
]
[
NumberStrategy
,
MatrixStrategy
]
else
[
NumberStrategy
]
end
end
end
end
end
end
end
...
...
lib/gitlab/ci/features.rb
View file @
088e30ae
...
@@ -62,10 +62,6 @@ module Gitlab
...
@@ -62,10 +62,6 @@ module Gitlab
::
Feature
.
enabled?
(
:destroy_only_unlocked_expired_artifacts
,
default_enabled:
false
)
::
Feature
.
enabled?
(
:destroy_only_unlocked_expired_artifacts
,
default_enabled:
false
)
end
end
def
self
.
parallel_matrix_enabled?
::
Feature
.
enabled?
(
:ci_parallel_matrix_enabled
)
end
def
self
.
bulk_insert_on_create?
(
project
)
def
self
.
bulk_insert_on_create?
(
project
)
::
Feature
.
enabled?
(
:ci_bulk_insert_on_create
,
project
,
default_enabled:
true
)
::
Feature
.
enabled?
(
:ci_bulk_insert_on_create
,
project
,
default_enabled:
true
)
end
end
...
...
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