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:
- Refer to the patch release runbook for engineers and maintainers for guidance.
- Ask questions on the
#releases
Slack channel (internal only).
Merge request reports
Activity
changed milestone to %17.4
added backend grouppipeline execution severity2 typebug labels
assigned to @hfyngvason
added devopsverify sectionci labels
added pipelinetier-1 label
mentioned in merge request !171715 (merged)
mentioned in issue #500887 (closed)
3 Warnings 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.
Backporting to older releases requires an exception request process 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
(UTC-7, 2 hours behind author)
@felipe_artur
(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
danger-review
job that generated this comment.Generated by
DangerE2E Test Result Summary
allure-report-publisher
generated test report!e2e-test-on-omnibus:
test report for ec63d25cexpand 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:
test report for ec63d25cexpand 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
added missed:17.4 label
requested review from @mfanGitLab
changed milestone to %17.4
removed missed:17.4 label
added pipeline:mr-approved label
added pipelinetier-3 pipeline:run-e2e-omnibus-once labels and removed pipelinetier-1 label
Before you set this MR to auto-merge
This merge request will progress on pipeline tiers until it reaches the last tier: pipelinetier-3. We will trigger a new pipeline for each transition to a higher tier.
Before you set this MR to auto-merge, please check the following:
- You are the last maintainer of this merge request
- The latest pipeline for this merge request is pipelinetier-3 (You can find which tier it is in the pipeline name)
- This pipeline is recent enough (created in the last 8 hours)
If all the criteria above apply, please set auto-merge for this merge request.
See pipeline tiers and merging a merge request for more details.
- Resolved by Jenny Kim
@mfanGitLab
, thanks for approving this merge request.This is the first time the merge request has been approved. Please ensure the
e2e:test-on-omnibus-ee
job has succeeded. If there is a failure, a Software Engineer in Test (SET) needs to confirm the failures are unrelated to the merge request. If there's no SET assigned to this team, ask for assistance on the#test-platform
Slack channel.
removed pipeline:run-e2e-omnibus-once label
changed milestone to %17.6
added missed:17.4 label
changed milestone to %17.4
started a merge train
mentioned in commit 16eae67d