Earlier branch creation for monthly releases: Guide engineers on how to backport bug fixes to the active stable branch

Context

gitlab-com/gl-infra/software-delivery&1 (closed) will move the active stable branch generation to be done one week earlier in the release schedule to allow for thorough testing and timely backports. This will increase the quality, safety, and reliability of the monthly release while enabling a better developer experience and confidence.

  • 2nd Wednesday of the month: RC and Stable branch creation
  • Up to 3rd Tuesday of the month: Bug fixes are backported to the active stable branch (see 'Backporting process' section below)
  • 3rd Tuesday of the month (Late EMEA or early AMER): Final RC is created
  • 3rd Wednesday of the month Tag the final version
  • 3rd Thursday of the month Release

Engineers self-serve on bug fixes for the active version by using the same process to backport any other bug fix. Up to the 3rd Tuesday of the month:

  • A bug is found (GitLab.com, discovered by engineers, etc).
  • Engineers prepare a bug fix
    • Bug fix is merged into the default branch and deployed to GitLab.com
    • Bug fix is backported to the active stable branch
    • Bug fix lands on the stable branch
    • Tests on the stable branch + Release environments are executed

Guide engineers on how to backport bug fixes to the active stable branch

Guidance should be provided to engineers on how to backport bug fixes to the active stable branch, this should consider:

  • The process will be the same as backporting bug fixes for the current version
  • Bug fixes can be backported to the active branch between the first RC and the final RC:
    • When the first RC is created, the active stable branch will be opened to maintaniers
    • Before the final Rc is created, the active stable branch will be limited to release managers, this is to prevent last-minute bug fixes from being added

This issue is to analyze what are the best options to guide engineers about this. Some ideas:

  • The runbook for backporting can be extended with the above.
  • Links added to the handbook and release/docs
Edited by Mayra Cabrera