[Labs-l] Getting rid of the test branch - get ready for a slight workflow change!

Ryan Lane rlane32 at gmail.com
Tue Jun 19 23:49:55 UTC 2012


Thanks to the new puppetmaster::self support
(https://labsconsole.wikimedia.org/wiki/Help:SelfHostedPuppet), it's
not necessary to merge changes into the test branch for them to apply
for testing. Today I merged all changes from production into the test
branch and sometime soon I'll be merging the remaining changes from
the test branch into the production branch. When this occurs, I'll
switch Labs to use the production branch by default.

This means that you should always test using puppetmaster::self, then
when your puppet changes are completely finished, push them into the
*production* branch. Don't push into the test branch anymore. Since
we're doing a workflow change, it would be good for us to start using
Git/Gerrit like the other repos do: meaning use topic branches and git
review.

Overall this should be a change for the better. The test branch was
always months out of date and we were forced to cherry-pick from
branch to branch, which was kind of a pain and doubled the review
process. Now things only ever need to be reviewed once.

I'll make sure the docs are updated before the switchover occurs.

- Ryan



More information about the Labs-l mailing list