Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

It is expected that some stabilization work may be needed once the support branch is cut.  This phase may be very short or very long until someone makes a proposal to prepare a Release Candidate.

The Release Manager may set the rules for backporting changes Proposals to bring completed and tested fixes from develop to the support branch may be made to the dev list.  The release manager should confirm that the ticket is in a resolved state on develop and has passed automated testing on develop.

Once three +1's are received (and no "minus 1"), the release manager may give the go-ahead for whoever proposed the fix to bring it to the support branch (via a PR or a cherry-pick -x).

After the fix has been merged, make sure the issue is marked with the correct fixed-in version(s) in Jira (every branch the commit is brought to should be listed).

No minimum voting period is required to bring a critical fix; it can be merged immediately upon getting three +1's.  However, the release manager should monitor and be prepared to revert it from the support branch if it causes test problems, or further discussion of the fix leads to any "minus 1".  For example, they may stipulate critical fixes only and/or require a dev list proposal and/or require a PR against the support branch and/or require a label to be added in Jira. In all cases, fixes need to be made on develop first, then backported.

Create the release candidate

...