canmove, Confirmed users
640
edits
Services/Process/MergingBetweenBranches: Difference between revisions
Jump to navigation
Jump to search
Services/Process/MergingBetweenBranches (view source)
Revision as of 21:46, 16 September 2011
, 16 September 2011Adding tree closure info.
m (→Timing) |
(Adding tree closure info.) |
||
| Line 14: | Line 14: | ||
* Merge last green changeset from m-c to services-central (see above) | * Merge last green changeset from m-c to services-central (see above) | ||
* Ensure everything stays green, including TPS (formerly Crossweave) | * Ensure everything stays green, including TPS (formerly Crossweave) | ||
* Close the tree (see below) | |||
* Hand off tinderbox builds to QA | * Hand off tinderbox builds to QA | ||
* Once QA signs off, merge the signed off changeset (not necessarily the services-central tip anymore) to mozilla-central | * Once QA signs off, merge the signed off changeset (not necessarily the services-central tip anymore) to mozilla-central | ||
* Reopen the tree | |||
* RESOLVE FIX corresponding bugs in Bugzilla, setting appropriate Target Milestone (e.g., mozilla5 if the destination m-c will become Firefox 5) | * RESOLVE FIX corresponding bugs in Bugzilla, setting appropriate Target Milestone (e.g., mozilla5 if the destination m-c will become Firefox 5) | ||
* When a change reaches mozilla-aurora for a particular release, set the relevant "status-firefoxN" flag to "fixed". | * When a change reaches mozilla-aurora for a particular release, set the relevant "status-firefoxN" flag to "fixed". | ||
| Line 25: | Line 27: | ||
* QA runs [https://wiki.mozilla.org/QA/Sync/Test_Plan#Client test plan] Monday + Tuesday | * QA runs [https://wiki.mozilla.org/QA/Sync/Test_Plan#Client test plan] Monday + Tuesday | ||
* Merge on Tuesday | * Merge on Tuesday | ||
== Closing the tree == | |||
We close the tree to avoid a more complicated merge after QA handoff. Wait to land patches until the merge to m-c has completed. | |||
* Go to the [http://tinderbox.mozilla.org/admintree.cgi?tree=Services-Central tinderbox admin page], and change the status message as described in the comments. | |||
* Put the reason the tree is closed in the tree reason section ("mozilla-central train has left the station", for example), and add a name to the sheriff if necessary: | |||
<nowiki>var treeReason = "mozilla-central train has left the station"; | |||
var treeSheriff = 'rnewman on #services';</nowiki> | |||
* Update the tree status in #services (either in the topic, or just announce it). | |||
=== Opening the tree === | |||
* Reverse the closure steps, clearing the treeReason and the name of the treeSheriff (leave the treeSheriff pointing to #services, as that will be displayed when the tree is busted or orange). | |||
== Open questions: == | == Open questions: == | ||