Thanks for this John. Maybe link to the release schedule as well so people know when branches will expect to be frozen as well.
*Will STEVENS* Lead Developer *CloudOps* *| *Cloud Solutions Experts 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 w cloudops.com *|* tw @CloudOps_ On Mon, Sep 12, 2016 at 3:15 PM, John Burwell <john.burw...@shapeblue.com> wrote: > All, > > There appears to be some confusion around who can merge a PR and when it > should occur. Section 2.3 of bylaws [1] are very clear, any committer may > commit code to any branch. As a community, we have agreed that > non-security contributions should be submitted as a PR, and that a PR must > meet the following criteria in order to be merged to a release branch: > > * At least code review LGTM > * At least test LGTM > * No -1s > > There have also been questions about what qualifies as a test LGTM. Code > reviewers should expect either new or updated Marvin test cases that verify > the issue being addressed by the PR. For my reviews, I consider a valid > test LGTM to have the following characteristics: > > * All smoke tests run against hardware. Ideally, against all 3 > hypervisors when the change is core. > * A set of additional component tests that cover the the functionality > that has been modified including tests added for the change > > When a PR meets this criteria, any committer may merge a PR using the > process described in the this wiki topic [2]. As a release manager, I > regularly check merges to release branches ensure that they meet this > threshold. If I find a non-security merge that does not meet this > criteria, I will roll it back and work with the contributors involved to > merged it once the threshold has been met. > > I plan to update the release section of the wiki in the near future to > clarify these points to remove crufty/duplicative information. I apologize > for the confusion, and hope this email clarifies the merge process until I > complete the wiki update. > > Thanks, > -John > > [1]: https://cloudstack.apache.org/bylaws.html > [2]: https://cwiki.apache.org/confluence/display/CLOUDSTACK/ > Release+principles+for+Apache+CloudStack+4.6+and+up# > ReleaseprinciplesforApacheCloudStack4.6andup-HowtomergeaPullRequest? > > john.burw...@shapeblue.com > www.shapeblue.com > 53 Chandos Place, Covent Garden, London VA WC2N 4HSUK > @shapeblue > > > >
