Backport Admin role fix to 15.10
What does this MR do and why?
In 15.10 !111904 (merged) introduced support for external groups and recently a bug was surfaced from that feature that de-priviliged admins into regular users. The appropriate fix has been merged into master for 15.11 however it's high severity and requires to be be patched onto 15.10.
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 original MR has been deployed to GitLab.com (not applicable for documentation or spec changes). -
This MR has a severity label assigned (if applicable). -
Ensure the e2e:package-and-test
job has either succeeded or been approved by a Software Engineer in Test.
Note to the merge request author and maintainer
The process of backporting bug fixes into stable branches is tracked as part of an internal pilot. If you have questions about this process, please:
- Refer to the internal pilot issue for feedback or questions.
- Refer to the patch release runbook for engineers and maintainers for guidance.
Merge request reports
Activity
changed milestone to %15.11
assigned to @adil.farrukh
added devopsmanage sectiondev labels
- Resolved by Jessie Young
@adil.farrukh the backport process is new to me but the instructions are here: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/patch/process_new.md#process-for-engineers
Looks like step 2 is:
Use the stable branch template and follow the check list.
Which does not appear to be used in this MR so maybe that should be updated
- A deleted user
added backend label
2 Warnings Most of the time, merge requests should target master
. Otherwise, please set the relevantPick into X.Y
label.The e2e:package-and-test-ee
job needs to succeed or have approval from a Software Engineer in Test.
Read the "QA e2e:package-and-test-ee" section for more details.1 Message CHANGELOG missing: If you want to create a changelog entry for GitLab FOSS, add the
Changelog
trailer to the commit message you want to add to the changelog.If you want to create a changelog entry for GitLab EE, also add the
EE: true
trailer to your commit message.If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Harsimar Sandhu (
@harsimarsandhu
) (UTC+5.5)Vitali Tatarintev (
@ck3g
) (UTC+2)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
QA
e2e:package-and-test-ee
@adil.farrukh, the
package-and-test
job must complete before merging this merge request.*If there are failures on the
package-and-test
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#quality
Slack channel.If needed, you can retry the
danger-review
job that generated this comment.Generated by
DangerAllure report
allure-report-publisher
generated test report!e2e-package-and-test:
test report for 2964d038expand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Manage | 393 | 0 | 17 | 160 | 410 | ❗ | | Configure | 1 | 0 | 0 | 0 | 1 | ✅ | | Create | 16 | 0 | 27 | 6 | 43 | ❗ | | Plan | 8 | 0 | 0 | 2 | 8 | ❗ | | Monitor | 8 | 0 | 0 | 8 | 8 | ❗ | | Framework sanity | 0 | 0 | 2 | 0 | 2 | ➖ | | Govern | 4 | 0 | 0 | 4 | 4 | ❗ | | Verify | 4 | 0 | 0 | 4 | 4 | ❗ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 434 | 0 | 46 | 184 | 480 | ❗ | +------------------+--------+--------+---------+-------+-------+--------+
@adil.farrukh, please can you answer the question: Should this have a feature flag? to help with code review for the Authentication and Authorization group.This nudge was added by this triage-ops policy.
added bugfunctional label
requested review from @sliaquat
The e2e test failure is known and unrelated.
This test was quarantined in this MR. I'll be back porting the quarantine MR on to
15-10-stable-ee
Edited by Sanad Liaquat- Resolved by Sanad Liaquat
@sliaquat
, thanks for approving this merge request.This is the first time the merge request is approved. Please ensure the
e2e:package-and-test-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#quality
Slack channel.
removed review request for @sliaquat
- Resolved by Adil Farrukh
@adil.farrukh Is this MR ready for review? If so, please mark it as ready. Thanks.