Revert keep around diff deletion for 17.7 backport
What does this MR do and why?
Reverts the MR that stopped creating keep around refs (!174925 (merged)) because it was causing an issue with diffs: https://gitlab.com/gitlab-org/gitlab/-/issues/511302 . This will affect self managed customers in 17.7+ so it needs a backport.
The MR that's already been merged to master is: !177083 (merged)
This reverts commit d5786005, reversing changes made to 8dcd9d61.
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
assigned to @garyh
added pipelinetier-1 label
- Resolved by Michael Kozono
To speed up your revert merge request, please consider using the revert merge request template. Adding the appropriate labels for resolving master:broken before the merge request is created will skip several CI/CD jobs.
For this merge request, if this is for resolving master:broken you can add the appropriate labels present in the merge request template, and trigger a new pipeline. It will be faster
.
added backend label
1 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.1 Message CHANGELOG missing: If this merge request needs a changelog entry, add the
Changelog
trailer to the commit message you want to add to the changelog.If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.
Reviewer roulette
Category Reviewer Maintainer backend @evakadlecova
(UTC+1, 7 hours ahead of author)
@hmehra
(UTC+11, 17 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
@garyh, 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
DangerEdited by ****- Resolved by 🤖 GitLab Bot 🤖
Proper labels assigned to this merge request. Please ignore me.
@garyh
- please see the following guidance and update this merge request.1 Error Please add typebug typefeature, or typemaintenance label to this merge request. Edited by 🤖 GitLab Bot 🤖
removed backend label
added typebug label
changed milestone to %17.7
added severity2 label
added backend 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 Michael Kozono
@mkozono
, 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.
requested review from @mkozono
E2E Test Result Summary
allure-report-publisher
generated test report!e2e-test-on-omnibus:
test report for 28630469expand test summary
+---------------------------------------------------------------------+ | suites summary | +----------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------+--------+--------+---------+-------+-------+--------+ | Manage | 25 | 0 | 20 | 0 | 45 | ✅ | | Data Stores | 46 | 0 | 11 | 0 | 57 | ✅ | | Govern | 110 | 0 | 9 | 0 | 119 | ✅ | | Verify | 49 | 0 | 16 | 1 | 65 | ✅ | | Plan | 83 | 0 | 8 | 0 | 91 | ✅ | | Create | 563 | 1 | 76 | 0 | 640 | ❌ | | Systems | 6 | 0 | 1 | 0 | 7 | ✅ | | GitLab Metrics | 2 | 0 | 1 | 0 | 3 | ✅ | | Package | 32 | 0 | 13 | 0 | 45 | ✅ | | Monitor | 12 | 0 | 13 | 0 | 25 | ✅ | | Fulfillment | 4 | 0 | 7 | 1 | 11 | ✅ | | Release | 5 | 0 | 1 | 0 | 6 | ✅ | | Ai-powered | 1 | 0 | 2 | 0 | 3 | ✅ | | Analytics | 3 | 0 | 0 | 0 | 3 | ✅ | | Configure | 1 | 0 | 3 | 0 | 4 | ✅ | | Secure | 5 | 0 | 3 | 0 | 8 | ✅ | | ModelOps | 0 | 0 | 1 | 0 | 1 | ➖ | | Growth | 0 | 0 | 2 | 0 | 2 | ➖ | +----------------+--------+--------+---------+-------+-------+--------+ | Total | 947 | 1 | 187 | 2 | 1135 | ❌ | +----------------+--------+--------+---------+-------+-------+--------+
e2e-test-on-gdk:
test report for 28630469expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Package | 25 | 0 | 13 | 0 | 38 | ✅ | | Plan | 82 | 0 | 8 | 0 | 90 | ✅ | | Create | 135 | 0 | 20 | 0 | 155 | ✅ | | Data Stores | 33 | 0 | 10 | 0 | 43 | ✅ | | Verify | 48 | 0 | 17 | 0 | 65 | ✅ | | Fulfillment | 2 | 0 | 7 | 0 | 9 | ✅ | | Govern | 80 | 0 | 12 | 0 | 92 | ✅ | | Manage | 1 | 0 | 9 | 0 | 10 | ✅ | | Monitor | 8 | 0 | 12 | 0 | 20 | ✅ | | Release | 5 | 0 | 1 | 0 | 6 | ✅ | | ModelOps | 0 | 0 | 1 | 0 | 1 | ➖ | | Ai-powered | 0 | 0 | 2 | 0 | 2 | ➖ | | Secure | 4 | 0 | 3 | 0 | 7 | ✅ | | Growth | 0 | 0 | 2 | 0 | 2 | ➖ | | Configure | 0 | 0 | 3 | 0 | 3 | ➖ | | Analytics | 2 | 0 | 0 | 0 | 2 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 425 | 0 | 120 | 0 | 545 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
Edited by ****removed pipeline:run-e2e-omnibus-once label
- Resolved by Michael Kozono
@garyh Thee2e:test-on-omnibus-ee
child pipeline has failed.-
e2e:test-on-omnibus-ee
pipeline: https://gitlab.com/gitlab-org/gitlab/-/pipelines/1616736365
e2e:test-on-omnibus-ee
pipeline is allowed to fail due its flakiness. Failures should be investigated to guarantee this backport complies with the Quality standards.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. -
- Resolved by Michael Kozono
@garyh Thee2e:test-on-omnibus-ee
child pipeline has failed.-
e2e:test-on-omnibus-ee
pipeline: https://gitlab.com/gitlab-org/gitlab/-/pipelines/1616748234
e2e:test-on-omnibus-ee
pipeline is allowed to fail due its flakiness. Failures should be investigated to guarantee this backport complies with the Quality standards.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. -
- Resolved by Michael Kozono
@garyh Thee2e:test-on-omnibus-ee
child pipeline has failed.-
e2e:test-on-omnibus-ee
pipeline: https://gitlab.com/gitlab-org/gitlab/-/pipelines/1616805226
e2e:test-on-omnibus-ee
pipeline is allowed to fail due its flakiness. Failures should be investigated to guarantee this backport complies with the Quality standards.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. -
Hey there
, could you please make sure this merge request gets merged?The merge request is set to auto-merge, but it is not currently mergeable (MR
detailed_merge_status
is discussions_not_resolved).This message was generated automatically. Improve it or delete it.
started a merge train
mentioned in commit 0fa7b5a4
mentioned in merge request !177932 (merged)
mentioned in merge request !178073 (merged)
mentioned in merge request !178100 (merged)
mentioned in issue gitlab-com/gl-infra/delivery#20811