Add a toggle in the `Enable merge trains` section to `Disable skip merge train`
🧩 Problem statement
Right now, when users enable merge trains (after enabling merged results pipelines) is enabled, Merge immediately
always shows up. In this case Merge Immediately does a normal merge by skipping the train, resulting in all the running MT pipelines getting disrupted. By adding an additional toggle, users would get an option if they want an option to merge immediately when merge trains are enabled, since a disruption to merge train pipelines could prove to be expensive in CI minutes and Wall Clock time.
⏳ Background
📝 Proposal
- Add an additional toggle in the
Enable merge train
section in the setting to allow users to configure if they only want the MR to be merged using a train. - Stretch - allow different roles to still skip the train and merge immediately.
-
Only allow merging via merge train
All merge requests must be added to a merge train to merge. The Merge immediately option is no longer available in merge requests
Proposed behaviour
-
Only allow merging via merge train
All merge requests must be added to a merge train to merge. The Merge immediately option is no longer available in merge requests.
- Merged Result pipeline is running
🏃 - Only 'Start the train' is shown. - Merged Result pipeline passes
✅ - Only 'Start the train' is shown. - Train is started and new pipeline is running
🏃 - no buttons - Merged Result pipeline is running for MR 2
🏃 - Only 'Add to the train' is shown. - Merged Result pipeline passes for MR 2
✅ - Only 'Add to the train' is shown. - MR is added to train and new pipeline is running for MR 2
🏃 - no buttons
-
Only allow merging via merge train
All merge requests must be added to a merge train to merge. The Merge immediately option is no longer available in merge requests.
- Merged Result pipeline is running
🏃 - Only 'Start the train' is shown. - Merged Result pipeline passes
✅ - 'Start the train' andSkip merge train and merge
is shown. - Train is started and new pipeline is running
🏃 - no buttons - Merged Result pipeline is running for MR 2
🏃 - Only 'Add to the train' is shown. - Merged Result pipeline passes for MR 2
✅ - Only 'Add to the train' is shown. - MR is added to train and new pipeline is running for MR 2
🏃 - no buttons