Page History

...

1. Decide with team if a bug should be dropped back to previous release or not, consider things like (use fix-version field in Jira to indicate this)
   1. bug was reported by user of previous release (easy decision )
   2. bug exposes behavior that was not in line with acceptance criteria for a user story that was delivered in previous release
2. Make the fix and have it merged in master branch
   1. use minimal code to avoid merge/drop back issues
   2. specific test for bug fix should be included where possible
3. Cherry pick the fix from master branch to release branch
   1. From Gerrit:
      
      1. Navigate to ... / Cherry Pick
      2. Fill the form with the release branch name (honolulu) in "Cherry Pick to branch" field and click "Cherry Pick"
         
         
         
   2. Using local branch (to resolve cherry-pick conflicts):
      1. Create local branch from honolulu
      2. Cherry-pick commit from master branch
      3. Resolve conflicts
      4. git push origin HEAD:refs/for/honolulu (or git review)
         
4. Review patch by peers as normal
   1. To facilitate the review, ensure that gerrit Ensure that Gerrit merge requests both in master and release branches have the same Topic value including Jira Issue ID Change-Id value (ex: https://gerrit.onap.org/r/q/intopic:+%2522CPS-292%2522Ia58a8dfcf427e373b24bb3be7436abf6abd55492). Then, related fixes can be easily filtered or and clicking on the Topic field Change-Id from one change provides the list of all related ones.
      
5. Update Release version in a separate commit if and when required
   A few bugs can be combined in one patch.
   Release notes doc should be updated too
   Typically only the 'patch' number (last digit) should be increased. See also
   1. Release Versioning Strategy (proposal for Honolulu)
   2. ONAP API Common Versioning Strategy (CVS) Guidelines
6. Once the fix is in release branch, deliver releases artifacts from release branch as described in previous section.

...