Skip to content
Snippets Groups Projects

Update patch release documentation

Merged Update patch release documentation
update-patch-release-documentation into master
All threads resolved!
Merged Mayra Cabrera requested to merge update-patch-release-documentation into master
All threads resolved!
Viewing commit baaf55d2
Show latest version
4 files
+ 60
− 39
Compare changes
  • Side-by-side
  • Inline
Files
4
general/patch/engineers.md
+ 24
− 24
@@ -2,31 +2,33 @@
@@ -2,31 +2,33 @@
## General guidelines
## General guidelines
As defined on the [maintenance policy], patch releases can only include
As defined on the [Maintenance Policy], **patch releases can only include
bug fixes for the current stable released version of GitLab.
bug fixes for the current stable released version of GitLab**.
Bug fixes can be backported to the current version if:
Bug fixes can be backported to the current version if:
* They have been previously fixed and merged into the GitLab default branch.
* They have been previously fixed and merged into the GitLab default branch.
* They have been deployed to GitLab.com.
* They have been deployed to GitLab.com.
* They are bug fixes. Per the maintenance policy [patch release guidelines], features can't be backported to previous versions
* They are bug fixes. Per the maintenance policy [patch release guidelines], features can't be backported to previous versions.
To backport bug fixes to older versions, take a look at the [backporting to older versions] section.
Patch releases are limited to the current stable released version, however pending on the severity of a bug,
 
bug fixes might be backported to more than one stable release. Have a look at the
 
[Backporting to versions outside of the Maintenance Policy] section for more information.
## Backporting a bug fix in the [GitLab project]
## Backporting a bug fix in the [GitLab project]
Once it has been deemed a bug fix should be backported, engineers should:
To backport a bug fix in the current version, GitLab engineers should:
1. Ensure the bug fixes comply with the [general guidelines]: The original MR is a bug fix that has been deployed to GitLab.com.
1. Ensure the bug fixes comply with the [general guidelines]: The original merge request is a bug fix that has been deployed to GitLab.com.
1. Open up a merge request in the GitLab canonical project, the MR should target the stable branch associated with the current version.
1. Open up a merge request in the [GitLab canonical project], the merge request should target the stable branch associated with the current version.
* **Note**: For efficiency, a merge request can be created via UI using the [cherry-pick feature].
* **Note**: For efficiency, a merge request can be created via UI using the [cherry-pick feature].
1. Use the [stable branch template] and follow the check list.
1. Use the [stable branch template] and follow the check list.
1. Ensure the merge request is approved by a maintainer. Merge requests targeting stable branches
1. Ensure the merge request is approved by a maintainer. Merge requests targeting stable branches only require one approval.
only require one approval.
1. Add a [severity label] to the merge request (if applicable). Severity labels helps release managers assess the urgency of
1. Add a [severity label] to the merge request (if applicable). Severity labels helps release managers assess the urgency of
a patch release.
a patch release.
1. Ensure the [`ee:package-and-test-ee` pipeline] is executed. This pipeline executes end-to-end testing for the GitLab platform
1. Ensure the [`ee:package-and-test-ee` pipeline] is executed. This pipeline executes end-to-end testing for the GitLab platform
guaranteeing the code changes are compliant from the Quality side.
guaranteeing the code changes are compliant from the Quality side. This pipeline is automatically executed on merge requests targeting
 
stable branches.
1. Verify the `ee:package-and-test-ee` is successfully executed. If failures arise, contact a Software in Test (SET) engineer to
1. Verify the `ee:package-and-test-ee` is successfully executed. If failures arise, contact a Software in Test (SET) engineer to
review if the failure is related to the merge request.
review if the failure is related to the merge request.
@@ -35,7 +37,7 @@ Once it has been deemed a bug fix should be backported, engineers should:
@@ -35,7 +37,7 @@ Once it has been deemed a bug fix should be backported, engineers should:
When a merge request targeting a stable branch is assigned to maintainers, they should:
When a merge request targeting a stable branch is assigned to maintainers, they should:
1. Confirm the merge request being backported has been deployed to GitLab.com
1. Confirm the merge request being backported has been deployed to GitLab.com
1. Verify only bug fixes are being backported. Per the [maintenance policy], features can't be backported.
1. Verify only bug fixes are being backported. Per the [Maintenance Policy], features can't be backported.
1. Ensure the [`ee:package-and-test-ee` pipeline] has been executed.
1. Ensure the [`ee:package-and-test-ee` pipeline] has been executed.
1. Verify if there are failures on the `ee:package-and-test-ee` pipeline. Due to [test flakiness], this
1. Verify if there are failures on the `ee:package-and-test-ee` pipeline. Due to [test flakiness], this
pipeline is allowed to fail, and as a consequence, it won't cause a failure on the upstream GitLab pipeline.
pipeline is allowed to fail, and as a consequence, it won't cause a failure on the upstream GitLab pipeline.
@@ -43,18 +45,16 @@ When a merge request targeting a stable branch is assigned to maintainers, they
@@ -43,18 +45,16 @@ When a merge request targeting a stable branch is assigned to maintainers, they
**Don't merge the backport until a SET has confirmed the failures are not related.**
**Don't merge the backport until a SET has confirmed the failures are not related.**
1. Once the above conditions are met, approve and set the merge request to MWPS.
1. Once the above conditions are met, approve and set the merge request to MWPS.
## Backporting a buf fix on [Managed Versioning] projects
## Backporting a bug fix on [Managed Versioning] projects
Once it has been deemed a bug fix should be backported, engineers should:
Once it has been deemed a bug fix should be backported, engineers should:
1. Ensure the bug fixes comply with the [general guidelines]: The original MR is a bug fix that has been deployed to GitLab.com.
1. Ensure the bug fixes comply with the [general guidelines]: The original merge request is a bug fix that has been deployed to GitLab.com.
1. Open up a merge request in the respective canonical project. The merge request should target
1. Open up a merge request in the respective canonical project. The merge request should target the stable branch associated with the current version.
the stable branch associated with the current version.
1. Use the stable branch template and follow the checklist
1. Use the stable branch template and follow the checklist
* [Omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/master/.gitlab/merge_request_templates/Stable%20Branch.md)
* [Omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/master/.gitlab/merge_request_templates/Stable%20Branch.md)
* [CNG](https://gitlab.com/gitlab-org/build/CNG/-/blob/master/.gitlab/merge_request_templates/Stable%20Branch.md)
* [CNG](https://gitlab.com/gitlab-org/build/CNG/-/blob/master/.gitlab/merge_request_templates/Stable%20Branch.md)
1. Ensure the merge request is approved by a maintainer. Merge requests targeting stable branches
1. Ensure the merge request is approved by a maintainer. Merge requests targeting stable branches only require one approval.
only require one approval.
1. Add a [severity label] to the merge request (if applicable). Severity labels helps release managers assess the urgency of
1. Add a [severity label] to the merge request (if applicable). Severity labels helps release managers assess the urgency of
a patch release.
a patch release.
@@ -63,13 +63,13 @@ Once it has been deemed a bug fix should be backported, engineers should:
@@ -63,13 +63,13 @@ Once it has been deemed a bug fix should be backported, engineers should:
When a merge request targeting a stable branch is assigned to maintainers, they should:
When a merge request targeting a stable branch is assigned to maintainers, they should:
1. Ensure the merge request being backported has been deployed to GitLab.com
1. Ensure the merge request being backported has been deployed to GitLab.com
1. Verify only bug fixes are being backported. Per the [maintenance policy], features can't be backported.
1. Verify only bug fixes are being backported. Per the [Maintenance Policy], features can't be backported.
1. Once the above conditions are met, proceed to merge the merge request.
1. Once the above conditions are met, proceed to merge the merge request.
## Additional considerations
## Additional considerations
1. Per the maintenance policy, continous patch releases will be prepared for the current version. If a patch
1. Release Managers will create patch releases for the current version depending on demand and other release pressures. If a patch
release for an older version is required, take a look at the [backporting to older versions] section.
release for an older version is required, take a look at the [Backporting to versions outside of the Maintenance Policy] section.
1. Tooling and guidance for a self-serve approach was introduced on 15.10, this means backports targeting older
1. Tooling and guidance for a self-serve approach was introduced on 15.10, this means backports targeting older
versions will require release managers' approval.
versions will require release managers' approval.
1. Keep an eye in Slack development and releases channels. When a patch release is published a notification
1. Keep an eye in Slack development and releases channels. When a patch release is published a notification
@@ -79,9 +79,9 @@ When a merge request targeting a stable branch is assigned to maintainers, they
@@ -79,9 +79,9 @@ When a merge request targeting a stable branch is assigned to maintainers, they
triggered on commits on stable branches on the [GitLab canonical project], this one is allowed to fail, and such,
triggered on commits on stable branches on the [GitLab canonical project], this one is allowed to fail, and such,
failures can be temporarily ignored.
failures can be temporarily ignored.
## Backporting to older versions
## Backporting to versions outside of the Maintenance Policy
Non-security patches that are outside of our [maintenance policy] must be requested
Non-security patches that are outside of our [Maintenance Policy] must be requested
and agreed upon by the Release Managers and the requester. Read through the [backporting to older releases]
and agreed upon by the Release Managers and the requester. Read through the [backporting to older releases]
documentation and open up a [backport request] issue if the bug fix meets the criteria.
documentation and open up a [backport request] issue if the bug fix meets the criteria.
@@ -89,7 +89,7 @@ documentation and open up a [backport request] issue if the bug fix meets the cr
@@ -89,7 +89,7 @@ documentation and open up a [backport request] issue if the bug fix meets the cr
Reach out the Delivery team on the [#releases] Slack channel for feedback and/or questions.
Reach out the Delivery team on the [#releases] Slack channel for feedback and/or questions.
[maintenance policy]: https://docs.gitlab.com/ee/policy/maintenance.html
[Maintenance Policy]: https://docs.gitlab.com/ee/policy/maintenance.html
[patch release guidelines]: https://docs.gitlab.com/ee/policy/maintenance.html#patch-releases
[patch release guidelines]: https://docs.gitlab.com/ee/policy/maintenance.html#patch-releases
[GitLab project]: https://gitlab.com/gitlab-org/gitlab
[GitLab project]: https://gitlab.com/gitlab-org/gitlab
[`ee:package-and-test-ee` pipeline]: https://docs.gitlab.com/ee/development/testing_guide/end_to_end/package_and_test_pipeline.html
[`ee:package-and-test-ee` pipeline]: https://docs.gitlab.com/ee/development/testing_guide/end_to_end/package_and_test_pipeline.html
@@ -103,5 +103,5 @@ Reach out the Delivery team on the [#releases] Slack channel for feedback and/or
@@ -103,5 +103,5 @@ Reach out the Delivery team on the [#releases] Slack channel for feedback and/or
[cherry-pick feature]: https://docs.gitlab.com/ee/user/project/merge_requests/cherry_pick_changes.html#cherry-pick-all-changes-from-a-merge-request
[cherry-pick feature]: https://docs.gitlab.com/ee/user/project/merge_requests/cherry_pick_changes.html#cherry-pick-all-changes-from-a-merge-request
[backport request]: https://gitlab.com/gitlab-org/release/tasks/-/issues/new?issuable_template=Backporting-request
[backport request]: https://gitlab.com/gitlab-org/release/tasks/-/issues/new?issuable_template=Backporting-request
[general guidelines]: #general-guidelines
[general guidelines]: #general-guidelines
[backporting to older versions]: #backporting-to-older-versions
[Backporting to versions outside of the Maintenance Policy]: #backporting-to-versions-outside-of-the-maintenance-policy
[backporting to older releases]: https://docs.gitlab.com/ee/policy/maintenance.html#backporting-to-older-releases
[backporting to older releases]: https://docs.gitlab.com/ee/policy/maintenance.html#backporting-to-older-releases