Skip to content

Prepare 11.6.5-ee release

Alex Hanselka requested to merge 11-6-stable-ee-patch-5 into 11-6-stable-ee

Main release issue: gitlab-org/release/tasks#642 (closed)

Summary

This MR prepares 11-6-stable-ee for %11.6 (11.6.5-ee) by merging 11-6-stable-ee-patch-5 into 11-6-stable-ee.

Before the 7th

Merge master into the preparation branch

After the 7th

MR Filter for ~"Pick into 11.6" MRs

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+11.6&scope=all&state=merged

Note to leave in MRs

Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/MERGE_REQUEST_ID, will merge into `11-6-stable-ee` ready for `11.6.5-ee`

/unlabel ~"Pick into 11.6"

Steps

  1. Perform automated cherry-picking to reduce the amount of manual picks required. Note this will run for both CE and EE:

    # In Slack
/chatops run cherry_pick 11.6.5

  2. Cherry-pick remaining commits into this MR using the link for ~"Pick into 11.6" above.

    • This can be done by checking out 11-6-stable-ee-patch-5 locally and using git cherry-pick -m1 MERGE_COMMIT_SHA
    • Note: Copy the merge commit SHA from the "merged into master" section of the merge widget.

  3. Push changes every so often and verify that the MR has been included

  4. Leave a note in the MR so others can easily see that it is on track to be included in a release.

    • Remove the ~"Pick into 11.6" label.

  5. If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the 11-6-stable-ee-patch-5 branch and assign it to the author of the conflicting files.

  6. Merge CE-to-EE using one of the workflows described in the Merge CE stable changes to EE docs

    • Note: Often, after a release has been tagged, the VERSION file in ee will have a conflict. Accept the -ee one

  7. Once this MR is green merge it to stable, preferably with a manual fast-forward merge to minimize waiting time, as described in Merging preparation MRs into stable

Checklist

  • Add changes into the preparation branches:
    • Before the 7th: Master has been merged into the preparation branch
    • After the 7th: Changes marked ~"Pick into 11.6" have been picked
  • CE->EE merge has taken place
  • Conflicts resolved
  • No new commits have introduced directly to the stable branch while this MR was in progress. If there are, check for a green pipeline after merging this MR.
Edited by Alex Hanselka

Merge request reports