[openstack-dev] [Fuel] Code merge policy

Dmitry Pyzhov dpyzhov at mirantis.com
Tue Apr 15 16:02:28 UTC 2014


So every developer should manually mark every such review as WIP? And
remove this flag only when everyone agreed to merge? This will require
additional actions in 50% of fuel-web and 100% of fuel-main reviews.
Developers make mistakes too.

Let's just be more accurate.


On Tue, Apr 15, 2014 at 6:41 PM, Mike Scherbakov
<mscherbakov at mirantis.com>wrote:

> Humans make mistakes... all the time. Let's think how we can automate this
> to have appropriate Jenkins check. In this particular case, we could do the
> following:
> a) make it "work in progress" if we still unsure on some deps
> b) can we have smoke test which would check that master node builds, and
> simplest deploy passes? This needs to be run only if there are changes
> discovered in ISO build script (including mirror changes), and puppet
> manifests which deploy master node
>
>
>
> On Tue, Apr 15, 2014 at 3:49 PM, Dmitry Pyzhov <dpyzhov at mirantis.com>wrote:
>
>> Guys,
>>
>> We have big and complicated structure of the project. And part of our
>> patchsets require additional actions before merge. Sometimes we need
>> approve from testers, sometimes we need merge requests in several repos at
>> the same time, sometimes we need updates of rpm repositories before merge.
>>
>> We have informal rule: invite all the required persons to the review. And
>> core reviewer does not merge code if part of +1's are missed. Sad, but this
>> rule is not obvious.
>>
>> This informal rule became even more strict when we need update of rpm/deb
>> repositories, because OSCI changes should be accomplished right before
>> merge. For such reviews we ask OSCI team to do changes, checks and merge.
>>
>> https://review.openstack.org/#/c/86001/ This particular request requires
>> check of our 4.1.1 rpm/deb repositories status. Thats why Roman Vyalov is
>> added as reviewer.
>>
>> I don't like over-bureaucracy. My suggestion is simple: take into account
>> reviewers status and do not merge if unsure.
>>
>>
>> _______________________________________________
>> OpenStack-dev mailing list
>> OpenStack-dev at lists.openstack.org
>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>>
>>
>
>
> --
> Mike Scherbakov
> #mihgen
>
> _______________________________________________
> OpenStack-dev mailing list
> OpenStack-dev at lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-dev/attachments/20140415/d6079576/attachment.html>


More information about the OpenStack-dev mailing list