The goal for Salt projects is to cut a new feature release every four to six
weeks. This document outlines the process for these releases, and the
subsequent bug fix releases which follow.
25.22.4.2. Maintenance and Bugfix Releases
Once a release has been cut, regular cherry-picking sessions should begin to
cherry-pick any bugfixes from the develop branch to the release branch
(e.g. 0.16). Once major bugs have been fixes and cherry-picked, a bugfix
release can be cut:
- On the release branch (i.e. 0.16), create an annotated tag for the
revision release. It should be preceded by the letter v. (e.g.
v0.16.2) Release candidates are unnecessary for bugfix releases.
- The release should be packaged from this annotated tag and uploaded to PyPI.
- The packagers should be notified on the salt-packagers mailing list so
they can create packages for all the major operating systems.
- After the packagers have been given a few days to compile the packages, the
release is announced on the salt-users mailing list.
25.22.4.3. Cherry-Picking Process for Bugfixes
Bugfixes should be made on the develop branch. If the bug also applies to
the current release branch, then on the pull request against develop, the
user should mention @basepi and ask for the pull request to be
cherry-picked. If it is verified that the fix is a bugfix, then the
Bugfix -- Cherry-Pick label will be applied to the pull request. When
those commits are cherry-picked, the label will be switched to the
Bugfix -- [Done] Cherry-Pick label. This allows easy recognition of which
pull requests have been cherry-picked, and which are still pending to be
cherry-picked. All cherry-picked commits will be present in the next release.
Features will not be cherry-picked, and will be present in the next feature
release.