Merge `stages:` across includes
What does this MR do?
Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/65622
- Moves
Gitlab::Ci::Config::Normalizer
toGitlab::Ci::Config::Normalize::Parallelizer
- Implements
Gitlab::Ci::Config::Normalize::ConfigMerger
How the merge works
- Only two configurations are merged at a time
- Merges on the same include level are merged at the same time
- Deeper merges are merged sequentially after the more shallow ones
- On cyclic merges an error is thrown
If you have configs A, B and C that need to get merged - A and B will get merged, then the resulting config will get merged with C.
Screenshots
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry for user-facing changes, or community contribution. Check the link for other scenarios. -
Documentation created/updated or follow-up review issue created -
Code review guidelines -
Merge request performance guidelines -
Style guides - N/A Database guides
- N/A Separation of EE specific content
Performance and Testing
- N/A Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process.
- N/A Tested in all supported browsers
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
- N/A Label as security and @ mention
@gitlab-com/gl-security/appsec
- N/A The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
- N/A Security reports checked/validated by a reviewer from the AppSec team