148
edits
ReleaseEngineering/How To/Land Buildbot Master Changes: Difference between revisions
ReleaseEngineering/How To/Land Buildbot Master Changes (view source)
Revision as of 09:13, 21 November 2017
, 21 November 2017Updated the instructions on how to land BB master changes
m (→Branches: typo) |
(Updated the instructions on how to land BB master changes) |
||
| Line 35: | Line 35: | ||
|} | |} | ||
= How to Land Things | = 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: | 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 == | == Land your patches == | ||
| Line 41: | Line 41: | ||
<p>This can be done at any time. It does not require you to touch production Buildbot masters.</p> | <p>This can be done at any time. It does not require you to touch production Buildbot masters.</p> | ||
== Watch for errors in | == Watch for errors in Travis == | ||
Travis CI is a hosted, distributed continuous integration service used to build and test software projects. Whenever we do a push to the above mentioned repositories, there will be some checks that will run against the current code to make sure it's functional. The end result will be displayed in #releng IRC channel. If the checks ran successfully, we can proceed to merging the changes to the production branches, otherwise we'll need to find a fix and repeat this step. | |||
== Merge your changes to the production branch == | == Merge your changes to the production branch == | ||
<p>When | <p>When Travis is happy with your changes, you should '''merge''' them to the appropriate production branch. When doing so, you should 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 == | == Update the Masters == | ||
The masters are already set-up to track the production branches of the repositories. After you've pushed your changes to HG you can update the checkouts and reconfig/restart as normal. All masters which track the production branch you've merged must be updated. See [[ReleaseEngineering/Managing_Buildbot_with_Fabric]] for one technique to make this easier. | The masters are already set-up to track the production branches of the repositories. After you've pushed your changes to HG you can update the checkouts and reconfig/restart as normal (the masters automatically reconfig themselves each hour, so, if not urgent, you can wait until then to have the latest changes applied). All masters which track the production branch you've merged must be updated. See [[ReleaseEngineering/Managing_Buildbot_with_Fabric]] for one technique to make this easier. | ||
== Update the Maintenance Page == | == Update the Maintenance Page == | ||
| Line 73: | Line 72: | ||
You can also use "-b" as an argument to "hg out". | You can also use "-b" as an argument to "hg out". | ||