As said we handle this a little different. One branch for development, staging and live.
Development of the puppet code base is done using in puppet environments, which can be used to test a change across systems in any of the environments. Once people consider the change working it is committed and pushed. At which point we check for lint or syntax errors as a precaution. Bigger changes are ussually hidden in if/else constructs that allows us to roll them out gradually. this works for us, because: - The development/staging and live environment have a big overlap. - We accept that there might be a few mistakes. It is a tradeoff between rigorous testing and development speed. Jos On Tue, May 29, 2012 at 10:34 PM, Andy Taylor <andytaylo...@gmail.com> wrote: > The git branches/Puppet environments actually mirror the > infrastructure. So we have groups of servers. Unstable is just for > nodes which I test new functionality on, dev is for web developers. So > it seemed to make sense to mirror the environments in the git > repository with branches. > > On May 29, 9:28 pm, Nigel Kersten <ni...@puppetlabs.com> wrote: >> On Mon, May 28, 2012 at 6:14 AM, Andy Taylor <andytaylo...@gmail.com> wrote: >> > I'm currently trying to work out the best way structure my Puppet >> > environments and VCS structure. At the moment I'mk working on >> > something like this: >> >> > Three Git repositories (one for modules, one for Hiera, one for node >> > manifests) >> > Multiple branches (each branch representing an environment, e.g. >> > production, dev, testing etc.) >> >> > When changes to modules/Hiera are made, the changes will be made to a >> > testing branch, and then merged up the branches until it hits >> > production (with the appropriate testing of course). So something like >> > this: >> >> > unstable > dev > testing > production >> >> Do you need a distinction between "unstable" and "dev" ? I've often found >> that I don't need those to be separate stages. >> >> >> >> >> >> >> >> >> >> >> >> > What system do you guys use? Any suggestions about the above workflow? >> >> > Thanks! >> >> > Andy >> >> > -- >> > You received this message because you are subscribed to the Google Groups >> > "Puppet Users" group. >> > To post to this group, send email to puppet-users@googlegroups.com. >> > To unsubscribe from this group, send email to >> > puppet-users+unsubscr...@googlegroups.com. >> > For more options, visit this group at >> >http://groups.google.com/group/puppet-users?hl=en. >> >> -- >> Nigel Kersten |http://puppetlabs.com| @nigelkersten >> Schedule Meetings at:http://tungle.me/nigelkersten > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Users" group. > To post to this group, send email to puppet-users@googlegroups.com. > To unsubscribe from this group, send email to > puppet-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/puppet-users?hl=en. > -- You received this message because you are subscribed to the Google Groups "Puppet Users" group. To post to this group, send email to puppet-users@googlegroups.com. To unsubscribe from this group, send email to puppet-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
