cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rohit Yadav <rohit.ya...@shapeblue.com>
Subject Re: [VOTE] Adapting git workflow for release branches
Date Tue, 19 Aug 2014 16:11:29 GMT

On 19-Aug-2014, at 5:08 pm, Pierre-Luc Dion <pdion@cloudops.com> wrote:
> +1 ,  CI shouldn't be another topic?
>
> What is required or missing to have CI in place?

We need more servers for running Jenkins slaves on them and automation around kicking builds
for hotfixes that have a for release branches.
We can work on them gradually.

About how to do it -- if you’re a committer you create a branch and if you’re not you
submit your patch via reviewboard and explicitly email the RM. And, finally it will be at
RM’s discretion and responsibility to check the CI build status (if available that is) and
decide what goes in and what not.

As for documentation fixes and build fixes, if RM allows you may commit them directly to the
release branch or follow the above procedure.

There is a good recommendation to have co-pilots available to the RMs to speed the above process
and help out when the RM is not available, but to introduce that we’ll need another proposal
thread and another voting thread.

IMHO just like how we should ideally commit, I don’t aim to solve several issues with this
voting thread. If you’ve good idea please start a proposal/voting thread of its own. This
is why I don’t want to dilute the 2 main things I want to introduce with this thread:

- Get more community participation and attention on release branches
- A guidelines for flow of changes across release/maintenance branches and from release branch(es)
to master branch (viz. the baseline protocol)

Kindly stick your views to the above only and I request not to encourage dilution of the voting
agendas.

Cheers.

>
>
> *Pierre-Luc DION*
> Architecte de Solution Cloud | Cloud Solutions Architect
> t 855.652.5683
>
> *CloudOps* Votre partenaire infonuagique* | *Cloud Solutions Experts
> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
> w cloudops.com *|* tw @CloudOps_
>
>
>
> On Tue, Aug 19, 2014 at 5:50 AM, Rohit Yadav <rohit.yadav@shapeblue.com>
> wrote:
>
>>
>> On 19-Aug-2014, at 11:29 am, Sebastien Goasguen <runseb@gmail.com> wrote:
>>> Say you grab a patch from review board and stick it in a hotfix branch,
>> test that …call for merge on release branch.
>>> Do we *merge* to master or can we apply the patch directly to master
>> (git am -s…) ?
>>
>> Once the hotfix branch is merged on release branch, we would merge the
>> release branch to master, that will bring the hotfix on master as well.
>>
>> We don’t want to encourage working on master for fixes that qualify for
>> release branches directly so ideally we should not git am -s the patch on
>> master. But there is scope for non-strictness for a situation needing git
>> am -s <patch> on master directly, it would be at the discretion of the RM
>> and committers.
>>
>> Regards,
>> Rohit Yadav
>> Software Architect, ShapeBlue
>> M. +41 779015219 | rohit.yadav@shapeblue.com
>> Blog: bhaisaab.org | Twitter: @_bhaisaab
>>
>>
>>
>> Find out more about ShapeBlue and our range of CloudStack related services
>>
>> IaaS Cloud Design & Build<
>> http://shapeblue.com/iaas-cloud-design-and-build//>
>> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
>> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
>> CloudStack Infrastructure Support<
>> http://shapeblue.com/cloudstack-infrastructure-support/>
>> CloudStack Bootcamp Training Courses<
>> http://shapeblue.com/cloudstack-training/>
>>
>> This email and any attachments to it may be confidential and are intended
>> solely for the use of the individual to whom it is addressed. Any views or
>> opinions expressed are solely those of the author and do not necessarily
>> represent those of Shape Blue Ltd or related companies. If you are not the
>> intended recipient of this email, you must neither take any action based
>> upon its contents, nor copy or show it to anyone. Please contact the sender
>> if you believe you have received this email in error. Shape Blue Ltd is a
>> company incorporated in England & Wales. ShapeBlue Services India LLP is a
>> company incorporated in India and is operated under license from Shape Blue
>> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil
>> and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is
>> a company registered by The Republic of South Africa and is traded under
>> license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>>

Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.yadav@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab



Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>

This email and any attachments to it may be confidential and are intended solely for the use
of the individual to whom it is addressed. Any views or opinions expressed are solely those
of the author and do not necessarily represent those of Shape Blue Ltd or related companies.
If you are not the intended recipient of this email, you must neither take any action based
upon its contents, nor copy or show it to anyone. Please contact the sender if you believe
you have received this email in error. Shape Blue Ltd is a company incorporated in England
& Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated
under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated
in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company
registered by The Republic of South Africa and is traded under license from Shape Blue Ltd.
ShapeBlue is a registered trademark.

Mime
View raw message