<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Feb 22, 2013 at 5:39 PM, Seth Vidal <span dir="ltr"><<a href="mailto:skvidal@fedoraproject.org" target="_blank">skvidal@fedoraproject.org</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 class="im"><br>
<br>
On Fri, 22 Feb 2013, Xavier Lamien wrote:<br>
<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">
<br>
<br>
<br>
How about a dedicated branch for staging where we can merge it into master when ready (just like puppet's)<br>
Also, I think git flow coud be a good candidate here to work on a specific 'role' or such.<br>
ie, you have staging branch in sync with master, you git flow config start mm_proxy_update, do your cooking, then<br>
publish your mm_proxy_update branch, then ansible it for testing. If everything went well, you merge your branch into staging/master<br>
depending of the purpose.<br>
<br>
</blockquote>
<br></div>
1. we do not have a stagin branch in puppet anymore. Haven't for a good long while<br></blockquote><div><br></div><div style>Well, git is saying me we still do </div><div style> [laxathom@lockbox01 puppet]$ git branch -r</div>
<div> origin/FI</div><div> origin/HEAD -> origin/master</div><div> origin/fedoracommunity</div><div> origin/master</div><div> origin/staging</div><div> origin/staging-old</div><div> origin/testing</div><div><br>
</div><div style>But indeed, last commit is from Feb, 2012.</div><div style><br></div><div style>Anyhow, they're EOL.</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">
<br>
2. I do not think we should do a separate branch like that, at all. I think it makes things hairier than they should be.<br>
<br>
3. If we're going to implement staging I think it should be like how puppet is NOW - we duplicate the modules and work on them in there. I know it is not 'the git way' but I think it makes it easier to know where you stand at any given moment and to be sure you are getting the playbooks you expect.<span class=""><font color="#888888"><br>
<br></font></span></blockquote><div style>Fair enough.</div><div style>So, how should we handle the dir.</div><div style>based on kevin proposal like:</div><div style>'role' dir</div><div style>mirrormanager </div>
<div style> |-- staging</div><div style> | -- proxy</div><div style> | -- etc</div><div style><br></div><div style>?</div><div style><br></div><div style><br></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 class=""><div class="h5">
<br>
______________________________<u></u>_________________<br>
infrastructure mailing list<br>
<a href="mailto:infrastructure@lists.fedoraproject.org" target="_blank">infrastructure@lists.<u></u>fedoraproject.org</a><br>
<a href="https://admin.fedoraproject.org/mailman/listinfo/infrastructure" target="_blank">https://admin.fedoraproject.<u></u>org/mailman/listinfo/<u></u>infrastructure</a></div></div></blockquote></div><br><br clear="all">
<div><br></div>-- <br>Xavier.t Lamien<br>--<br><a href="http://fedoraproject.org/wiki/XavierLamien">http://fedoraproject.org/wiki/XavierLamien</a><br>GPG-Key ID: F3903DEB<br>Fingerprint: 0F2A 7A17 0F1B 82EE FCBF 1F51 76B7 A28D F390 3DEB
</div></div>