Use standard merge commit for merge trains
What does this MR do and why?
This changes the merge commit for merge trains to align with what would get merged on the target branch. This is in preparation of enabling fast-forward merges and semi-linear merges from merge trains, as those will get fast-forward merged directly from the train ref.
The change is now enabled by default behind the feature flag
standard_merge_train_ref_merge_commit
, with rollout issue:
#422724 (closed)
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
Before | After |
---|---|
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Merge request reports
Activity
changed milestone to %16.4
added backend feature flag feature flagexists grouppipeline execution labels
assigned to @hfyngvason
added devopsverify sectionci labels
mentioned in issue #422724 (closed)
- Resolved by Hordur Freyr Yngvason
1 Warning featureaddition and featureenhancement merge requests normally have a documentation change. Consider adding a documentation update or confirming the documentation plan with the Technical Writer counterpart.
For more information, see:
- The Handbook page on merge request types.
- The definition of done documentation.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Dangermentioned in commit gitlab-org-sandbox/gitlab-jh-validation@e5e63c8c
- Resolved by Hordur Freyr Yngvason
@hfyngvason - please see the following guidance and update this merge request.1 Error Please add typebug typefeature, or typemaintenance label to this merge request.
Allure report
allure-report-publisher
generated test report!e2e-package-and-test:
test report for 80620c37expand test summary
+-------------------------------------------------------------+ | suites summary | +--------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +--------+--------+--------+---------+-------+-------+--------+ | Verify | 96 | 0 | 12 | 0 | 108 | ✅ | +--------+--------+--------+---------+-------+-------+--------+ | Total | 96 | 0 | 12 | 0 | 108 | ✅ | +--------+--------+--------+---------+-------+-------+--------+
e2e-test-on-gdk:
test report for 80620c37expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Plan | 51 | 0 | 0 | 0 | 51 | ✅ | | Create | 38 | 0 | 0 | 0 | 38 | ✅ | | Data Stores | 20 | 0 | 0 | 1 | 20 | ❗ | | Govern | 33 | 0 | 1 | 0 | 34 | ✅ | | Manage | 12 | 0 | 1 | 0 | 13 | ✅ | | Verify | 8 | 0 | 0 | 0 | 8 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 162 | 0 | 2 | 1 | 164 | ❗ | +-------------+--------+--------+---------+-------+-------+--------+
added 178 commits
-
da559c93...142b36a7 - 177 commits from branch
master
- 80620c37 - Use standard merge commit for merge trains
-
da559c93...142b36a7 - 177 commits from branch
marked the checklist item I have evaluated the MR acceptance checklist for this MR. as completed
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@61d494dd
added featureenhancement label
added typefeature label
- Resolved by drew stachon
@drew would you mind also merging this change in flag defaults?
requested review from @drew
@drew
, thanks for approving this merge request.This is the first time the merge request has been approved. To ensure full test coverage, a new pipeline will be started shortly.
For more info, please refer to the following links:
added pipeline:mr-approved label
mentioned in commit gitlab-org-sandbox/gitlab-jh-validation@a94cb64d
enabled an automatic merge when the pipeline for a94cb64d succeeds
@drew, did you forget to run a pipeline before you merged this work? Based on our code review process, if the latest pipeline was created more than 6 hours ago OR finished more than 2 hours ago, you should:
- Ensure the merge request is not in Draft status.
- Start a pipeline (especially important for Community contribution merge requests).
- Set the merge request to auto-merge.
This is a guideline, not a rule. Please consider replying to this comment for transparency.
This message was generated automatically. You're welcome to improve it.
mentioned in commit 9fb94fb9
added workflowstaging-canary label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label
added workflowpost-deploy-db-staging label and removed workflowproduction label
added workflowpost-deploy-db-production label and removed workflowpost-deploy-db-staging label
added releasedcandidate label
added releasedpublished label and removed releasedcandidate label
mentioned in merge request kubitus-project/kubitus-installer!2437 (merged)