<div dir="ltr"><br><div class="gmail_extra"><div class="gmail_quote">On Mon, Jun 3, 2013 at 9:33 AM, Anne Gentle <span dir="ltr"><<a href="mailto:annegentle@justwriteclick.com" target="_blank">annegentle@justwriteclick.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote"><div class="im">On Mon, Jun 3, 2013 at 8:31 AM, Lorin Hochstein <span dir="ltr"><<a href="mailto:lorin@nimbisservices.com" target="_blank">lorin@nimbisservices.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><div class="gmail_quote"><div>On Sun, Jun 2, 2013 at 11:09 PM, Anne Gentle <span dir="ltr"><<a href="mailto:annegentle@justwriteclick.com" target="_blank">annegentle@justwriteclick.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">
<div>On Sat, Jun 1, 2013 at 8:40 PM, Lorin Hochstein <span dir="ltr"><<a href="mailto:lorin@nimbisservices.com" target="_blank">lorin@nimbisservices.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div>All:</div><div><br></div>I've noticed that there have been several bugs in the grizzly branch that were fixed in the master but hadn't been backported to stable/grizzly. I'd like to propose the following automated approach to ensure backports happen more regularly:<div>
<br></div><div>Any patch to the master branch must specify in the commit message whether the patch should be backported. For example:</div><div><br></div><div>backport: stable/grizzly</div><div><br></div><div>or</div><div>
<br></div><div>backport: none</div><div><br></div><div>or</div><div><br></div><div>backport: stable/grizzly stable/folsom</div><div><br></div><div><br></div><div>If this line is missing from the commit log, then a gating job will fail, and jenkins will link to the error message (e.g., "Missing 'backport: ' line. Please specify "backport: stable/grizzly" if this should be backported to grizzly or "backport: none" if this shouldn't be backported).</div>
<div><br></div></div></blockquote><div><br></div></div><div>This sounds like a good mechanism, and I love automation. For how many more weeks / months will the automation work without any merging intervention needed manually? I haven't had too much trouble but imagine as more patches get backported it'll get worse? What do you think? </div>
<div><br></div></div></div></div></blockquote><div><br></div></div><div>I'm having a little trouble understanding the question. Are you asking how long I think that the automation will work before it hits a patch that can't automatically backport?</div>
<div><br></div><div>I suspect that there will be a fairly large number of patches where attempt to auto-backport will fail due to conflicts. I think when that happens Jenkins will need to add a message to the master patch proposal mentioning that the auto-backport failed. At that point, somebody from the doc team will need to manually resolve the change and do the backport. </div>
<div><br></div></div></div></div></blockquote><div><br></div></div><div>Yep, you answered my question. So what's the process after Jenkins can't auto-backport? Just git review -d the patch and manually resolve, repatching? </div>
<div><br></div></div></div></div></blockquote><div><br></div><div style>I think if Jenkins can't auto-backport, there won't be a new, auto-generated patch against stable/grizzly. Assuming when the script runs the cherry-pick, that it fails because of a conflict, there really isn't anything the script can do at that point to recover. All it can do is post a message against the original patch saying "auto-backport failed".</div>
<div style><br></div><div style>So, if the auto-backport fails, the process degenerates back to what we do currently. Somebody will have to notice the "auto-backport failed" message, manually create a new branch off of stable/grizzly, cherry-pick from the patch against the master branch, and submit that. </div>
<div style><br></div><div style>Lorin</div><div><br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra">
<div class="gmail_quote"><div></div><div>Anne</div><div class="im"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra">
<div class="gmail_quote">
<div></div><div>Or, were you asking about something else?</div><span><font color="#888888"><div><br></div><div>Lorin</div></font></span><div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div></div><div>Anne</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div><div dir="ltr"><div></div><div>When the patch is merged into trunk, then jenkins automatically does a cherry-pick and merge proposal against the branches specified in the backport line.<br>
<div><div><br></div><div><br></div><div>
What do you folks think?</div><span><font color="#888888"><div><br></div><div><br></div><div>Lorin<br clear="all"><div><br></div>-- <br><div dir="ltr">Lorin Hochstein<br><div>Lead Architect - Cloud Services</div>
<div>Nimbis Services, Inc.</div><div>
<a href="http://www.nimbisservices.com" target="_blank">www.nimbisservices.com</a></div></div>
</div></font></span></div></div></div>
<br></div><div>_______________________________________________<br>
Openstack-docs mailing list<br>
<a href="mailto:Openstack-docs@lists.openstack.org" target="_blank">Openstack-docs@lists.openstack.org</a><br>
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs</a><br>
<br></div></blockquote></div><span><font color="#888888"><br><br clear="all"><div><br></div>-- <br>Anne Gentle<br><a href="mailto:annegentle@justwriteclick.com" target="_blank">annegentle@justwriteclick.com</a>
</font></span></div></div>
</blockquote></div></div><div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">Lorin Hochstein<br><div>Lead Architect - Cloud Services</div><div>Nimbis Services, Inc.</div><div><a href="http://www.nimbisservices.com" target="_blank">www.nimbisservices.com</a></div>
</div>
</div></div></div>
</blockquote></div></div><span class="HOEnZb"><font color="#888888"><br><br clear="all"><div><br></div>-- <br>Anne Gentle<br><a href="mailto:annegentle@justwriteclick.com" target="_blank">annegentle@justwriteclick.com</a>
</font></span></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">Lorin Hochstein<br><div>Lead Architect - Cloud Services</div><div>Nimbis Services, Inc.</div><div><a href="http://www.nimbisservices.com" target="_blank">www.nimbisservices.com</a></div>
</div>
</div></div>