canmove, Confirmed users
6,441
edits
ReleaseEngineering/How To/Land Buildbot Master Changes: Difference between revisions
ReleaseEngineering/How To/Land Buildbot Master Changes (view source)
Revision as of 21:11, 6 December 2010
, 6 December 2010→Branches
| Line 39: | Line 39: | ||
| Currently, this is the only used branch of the tools repository. It should be treated like the "production" branches of other repositories. | | Currently, this is the only used branch of the tools repository. It should be treated like the "production" branches of other repositories. | ||
|} | |} | ||
= How to Land Things = | |||
This section works on the assumption that you have one or more reviewed and tested patches. When you do, the following procedure should be used to land them: | |||
== Land your patches == | |||
<p>Land your patches on the appropriate "default" branch. For 0.8 masters this is always 'default'. For 0.7 masters it may be 'buildbot-0.7'.</p> | |||
<p>This can be done at any time. It does not require you to touch production Buildbot masters.</p> | |||
== Watch for errors in Preproduction. == | |||
<p>Our [ReleaseEngineering/Preproduction Preproduction systems] run a variety of tests on landings to the default branches. They will send e-mail if any errors occur. Watch for these and backout or fix your patches appropriately.</p> | |||
== Merge your changes to the production branch == | |||
<p>When your satisfied with the preproduction results and ready to land you should '''merge''' your changes to appropriate production branch. When doing so, you should generally be prepared to take any other tested changes from the default branch, too. See below for some helpful tips on merging.</p> | |||
== Update the Masters == | |||