Skip to content
Snippets Groups Projects

Use standard merge commit for merge trains

All threads resolved!

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.

Edited by Hordur Freyr Yngvason

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Contributor
    1 Warning
    :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:

    If needed, you can retry the :repeat: danger-review job that generated this comment.

    Generated by :no_entry_sign: Danger

  • Contributor

    Allure report

    allure-report-publisher generated test report!

    e2e-package-and-test: :white_check_mark: test report for 80620c37

    expand 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: :exclamation: test report for 80620c37

    expand 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

    Compare with previous version

  • Hordur Freyr Yngvason marked the checklist item I have evaluated the MR acceptance checklist for this MR. as completed

    marked the checklist item I have evaluated the MR acceptance checklist for this MR. as completed

  • Hordur Freyr Yngvason marked this merge request as ready

    marked this merge request as ready

  • Hordur Freyr Yngvason resolved all threads

    resolved all threads

  • Hordur Freyr Yngvason requested review from @drew

    requested review from @drew

  • drew stachon resolved all threads

    resolved all threads

  • drew stachon approved this merge request

    approved this merge request

  • :wave: @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:

  • drew stachon enabled an automatic merge when the pipeline for a94cb64d succeeds

    enabled an automatic merge when the pipeline for a94cb64d succeeds

  • merged

  • @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:

    1. Ensure the merge request is not in Draft status.
    2. Start a pipeline (especially important for Community contribution merge requests).
    3. 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.

  • drew stachon mentioned in commit 9fb94fb9

    mentioned in commit 9fb94fb9

  • added workflowstaging label and removed workflowcanary label

  • Please register or sign in to reply
    Loading