Commit 6f41847d authored by Robert Speicher's avatar Robert Speicher

Merge branch 'remove-ff-ci_parallel_matrix_enabled' into 'master'

Remove ci_parallel_matrix_enabled feature flag

Closes #232350

See merge request gitlab-org/gitlab!38593
parents db41f081 088e30ae
...@@ -3479,10 +3479,6 @@ job split into three separate jobs. ...@@ -3479,10 +3479,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.
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment