canmove, Confirmed users
1,394
edits
(→Staging a New Master: notes about buildbotconfig prereqs) |
No edit summary |
||
Line 18: | Line 18: | ||
Switch to the ''default'' branch and use ''hg merge'' to merge the changes. Resolve any conflicts (bearing in mind that they may be significant, rather than merely textual). | Switch to the ''default'' branch and use ''hg merge'' to merge the changes. Resolve any conflicts (bearing in mind that they may be significant, rather than merely textual). | ||
Commit your updates to ''default''. That's it - now it's time to test! | Commit your updates to ''default''. That's it - now it's time to test! | ||
Line 25: | Line 23: | ||
== Staging a New Master == | == Staging a New Master == | ||
On a staging machine, | On a staging machine, | ||
* clone your hg repo into ''/tmp'' or somewhere convenient | * clone your buildbot hg repo into ''/tmp'' or somewhere convenient | ||
* create a new virtualenv in /tools: | * create a new virtualenv in /tools, using python-2.6.5: | ||
/tools/python-2.6.5/bin/virtualenv /tools/buildbot-0.8.2 | /tools/python-2.6.5/bin/virtualenv /tools/buildbot-0.8.2 | ||
* activate it | * activate it | ||
Line 32: | Line 30: | ||
* install the buildbot (master) package | * install the buildbot (master) package | ||
cd master/ | cd master/ | ||
pip install . | |||
Back in your staging directory, edit the Makefile to point it at the new version: | Back in your staging directory, edit the Makefile to point it at the new version: | ||
BUILDBOT=/tools/buildbot-0.8.2/bin/buildbot | BUILDBOT=/tools/buildbot-0.8.2/bin/buildbot | ||
that's it - ''make restart'' and check the /about URI to make sure it upgraded ( | that's it - ''make restart'' and check the /about URI to make sure it upgraded (you should see an hg revision in the footer). You will probably need to run ''buildbot upgrade-master'' to upgrade the database first, but the buildmaster will tell you that. |