Skip to content
Snippets Groups Projects

Ensure auto_merge_enabled is set when validating merge trains

What does this MR do and why?

Backport of !170652 (merged) to %17.4

Merge trains can get stuck if there is inconsistent state between the merge request and merge train.

This fix allows merge trains to recover from such inconsistent state the next time the train is refreshed. This, happens, for example, when a pipeline completes, and when a merge request is added or removed from the train. Corrected MRs will show two cancellation-related system notes: One for the original cancellation action that left the MR in an inconsistent state, and one for the merge train cleanup caused by the new validation being enforced.

This MR is being backported because the it is part of a high-value customer escalation and the customer is several releases behind. This 17.4 backport is the goal, but there is also a 17.5 backport for parity .

See #500887 (closed)

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • This MR has a severity label assigned (if applicable).
  • Set the milestone of the merge request to match the target backport branch version.
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:test-on-omnibus-ee job has either succeeded or been approved by a Software Engineer in Test.

Note to the merge request author and maintainer

If you have questions about the patch release process, please:

Edited by Jenny Kim

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
  • changed milestone to %17.4

  • Hordur Freyr Yngvason marked the checklist item This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch. as completed

    marked the checklist item This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch. as completed

  • Hordur Freyr Yngvason marked the checklist item The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes). as completed

    marked the checklist item The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes). as completed

  • Hordur Freyr Yngvason marked the checklist item This MR has a [severity label] assigned (if applicable). as completed

    marked the checklist item This MR has a [severity label] assigned (if applicable). as completed

  • Hordur Freyr Yngvason marked the checklist item Set the milestone of the merge request to match the target backport branch version. as completed

    marked the checklist item Set the milestone of the merge request to match the target backport branch version. as completed

  • Hordur Freyr Yngvason changed the description

    changed the description

  • mentioned in merge request !171715 (merged)

  • 3 Warnings
    :warning: There were no new or modified feature flag YAML files detected in this MR.

    If the changes here are already controlled under an existing feature flag, please add
    the feature flagexists. Otherwise, if you think the changes here don't need
    to be under a feature flag, please add the label feature flagskipped, and
    add a short comment about why we skipped the feature flag.

    For guidance on when to use a feature flag, please see the documentation.

    :warning: Backporting to older releases requires an exception request process
    :warning: The e2e:test-on-omnibus-ee job needs to succeed or have approval from a Software Engineer in Test.
    Read the "QA e2e:test-on-omnibus-ee" section for more details.

    Reviewer roulette

    Category Reviewer Maintainer
    backend @freinink profile link current availability (UTC-7, 2 hours behind author) @felipe_artur profile link current availability (UTC-3, 2 hours ahead of author)

    Please refer to documentation page for guidance on how you can benefit from the Reviewer Roulette, or use the GitLab Review Workload Dashboard to find other available reviewers.

    QA e2e:test-on-omnibus-ee

    @hfyngvason, the e2e:test-on-omnibus job must complete before merging this merge request.*

    If there are failures on the e2e:test-on-omnibus pipeline, ping your team's associated Software Engineer in Test (SET) to confirm the failures are unrelated to the merge request. If there's no SET assigned, ask for assistance on the #test-platform Slack channel.

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

    Generated by :no_entry_sign: Danger

  • E2E Test Result Summary

    allure-report-publisher generated test report!

    e2e-test-on-omnibus: :x: test report for ec63d25c

    expand test summary
    +---------------------------------------------------------------------+
    |                           suites summary                            |
    +----------------+--------+--------+---------+-------+-------+--------+
    |                | passed | failed | skipped | flaky | total | result |
    +----------------+--------+--------+---------+-------+-------+--------+
    | Govern         | 108    | 0      | 5       | 0     | 113   | ✅     |
    | Plan           | 82     | 0      | 9       | 0     | 91    | ✅     |
    | Verify         | 51     | 0      | 15      | 0     | 66    | ✅     |
    | Create         | 547    | 0      | 72      | 0     | 619   | ✅     |
    | Monitor        | 12     | 0      | 13      | 0     | 25    | ✅     |
    | Systems        | 7      | 0      | 0       | 0     | 7     | ✅     |
    | Manage         | 26     | 1      | 18      | 0     | 45    | ❌     |
    | Data Stores    | 46     | 0      | 11      | 0     | 57    | ✅     |
    | GitLab Metrics | 2      | 0      | 1       | 0     | 3     | ✅     |
    | Fulfillment    | 4      | 0      | 7       | 0     | 11    | ✅     |
    | Analytics      | 3      | 0      | 0       | 0     | 3     | ✅     |
    | Package        | 31     | 0      | 14      | 0     | 45    | ✅     |
    | Configure      | 1      | 0      | 3       | 0     | 4     | ✅     |
    | Release        | 5      | 0      | 1       | 0     | 6     | ✅     |
    | Secure         | 4      | 0      | 2       | 1     | 6     | ✅     |
    | Ai-powered     | 0      | 0      | 2       | 0     | 2     | ➖     |
    | ModelOps       | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Growth         | 0      | 0      | 2       | 0     | 2     | ➖     |
    +----------------+--------+--------+---------+-------+-------+--------+
    | Total          | 929    | 1      | 176     | 1     | 1106  | ❌     |
    +----------------+--------+--------+---------+-------+-------+--------+

    e2e-test-on-gdk: :white_check_mark: test report for ec63d25c

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Plan        | 74     | 0      | 1       | 0     | 75    | ✅     |
    | Package     | 20     | 0      | 12      | 0     | 32    | ✅     |
    | Govern      | 72     | 0      | 0       | 0     | 72    | ✅     |
    | Create      | 128    | 0      | 16      | 0     | 144   | ✅     |
    | Verify      | 46     | 0      | 2       | 0     | 48    | ✅     |
    | Monitor     | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Secure      | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Data Stores | 33     | 0      | 1       | 0     | 34    | ✅     |
    | Analytics   | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Release     | 5      | 0      | 0       | 0     | 5     | ✅     |
    | Manage      | 1      | 0      | 1       | 0     | 2     | ✅     |
    | Fulfillment | 2      | 0      | 0       | 0     | 2     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 395    | 0      | 33      | 0     | 428   | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
  • changed milestone to %17.6

  • Hordur Freyr Yngvason marked this merge request as ready

    marked this merge request as ready

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading