Coming soon...Fine branch


#1

On Tuesday, March 28, the fine branch will be created in GitHub for the main repos [1] along with the related labels [2].

From this point on, EVERYTHING destined for Fine MUST be labeled with fine/yes as follows:

fine/yes – needs to be backported immediately for inclusion in the next build
fine/no OR no fine label - upstream master-only targeting ManageIQ.next

If a cherry-pick has conflicts, the PR will be labeled with, fine/conflict, meaning the original developer needs to create a PR on the fine branch with conflict resolved.

The following rules apply for backporting a PR:

  • title should be the same as master and prefixed with [FINE]
  • have a link to the PR on master
  • have same labels as PR on master, except the backport label itself (i.e. DON’T put fine/yes on the direct-to-fine PR, but DO put bug or enhancement and others)

When we get to fine blockers-only (scheduled at the beginning of Sprint 59 on April 11th), then the following will go into effect:

fine/yes AND blocker - needs to be backported immediately for inclusion in the next build
fine/yes AND without blocker - needs to be backported after the current release is shipped

[1] https://github.com/ManageIQ/manageiq-release/blob/master/config/repos.yml
Note: Jason will be renaming master -> fine once the branch is cut.
[2] fine/yes, fine/no, fine/backported, fine/conflict


#2
  • have same labels as PR on master

Maybe this should explicitly mention same labels except for release labels (such as fine/yes or euwe/backported).

(People still seem to be adding them to backport PRs on occasion.)


#3

Yeah good point.