Over in bug 818732, we're planning to turn on per-window private browsing on Nightly by default. So far we've had a bunch of early testers on the Birch branch, and we would like to move them to Nightly so that they can receive updates after we switch over in bug 818732. Once that happens, I'm planning to repurpose Birch to build global PB builds. In order for the transition to happen smoothly for those people, we need to move those nightly users to the default nightly update channel. Currently we're planning to finish the switchover tomorrow, so that the first Nightly with per-window private browsing would be built on Monday night.

For my own clarification: 11:02 < catlee> ehsan: ok, I think that makes sense. So after 818732 lands on nightly, we want all birch users migrated back, and then will disable future birch nightlies 11:03 <@ehsan> catlee: correct

Given you want to use birch for something else later, the main thing here is to change the channel from nightly-birch to nightly for these users. catlee suggests this could be done in the last nightly build of the branch,

For that to work we'd need to * make sure channel-prefs.js is included in the mar file, by removing this exclusion at http://hg.mozilla.org/projects/birch/file/default/tools/update-packaging/common.sh#l146 * modifying the mozconfigs to hardcode the channel instead of taking it from the environment We could do this in this order * merge changes to mozilla-central, pause if they don't stick * disable birch updates (RelEng does a chmod) * tweak birch as above and do a set of nightlies (Ehsan) * verify that the updates does what we expect, then re-enable birch updates (RelEng+Ehsan, probably need to fake up some update.xml) * disable nightlies on birch * monitor ADI counts until count drops * repurpose birch for next work Given there are ~80 ADI on nightly-birch in the last week is there a communication channel which requires a bunch less work to achieve the same result ?

(In reply to comment #3) > For that to work we'd need to > * make sure channel-prefs.js is included in the mar file, by removing this > exclusion at > > http://hg.mozilla.org/projects/birch/file/default/tools/update-packaging/common.sh#l146 > * modifying the mozconfigs to hardcode the channel instead of taking it from > the environment > > We could do this in this order > * merge changes to mozilla-central, pause if they don't stick > * disable birch updates (RelEng does a chmod) > * tweak birch as above and do a set of nightlies (Ehsan) > * verify that the updates does what we expect, then re-enable birch updates > (RelEng+Ehsan, probably need to fake up some update.xml) > * disable nightlies on birch > * monitor ADI counts until count drops > * repurpose birch for next work FWIW, I'm not going to need nightlies on the Birch branch any more once this switchover is done. Does that change anything in this plan? > Given there are ~80 ADI on nightly-birch in the last week is there a > communication channel which requires a bunch less work to achieve the same > result ? Unfortunately not. :(

Wasn't there a communication channel to get people to use these nightlies in the first place?

(In reply to comment #5) > Wasn't there a communication channel to get people to use these nightlies in > the first place? The communication channel was <http://ehsanakhgari.org/blog/2012-11-30/per-window-private-browsing-ready-for-testing-now-2>.

(In reply to Ehsan Akhgari [:ehsan] from comment #4) > FWIW, I'm not going to need nightlies on the Birch branch any more once this > switchover is done. Does that change anything in this plan? That's helps remove the monitor and delay in re-purposing. The earlier steps are QA to make sure the changes I sketched out are valid.

FWIW, it seems like the switchover will not happen today.

Per IRC we're ready to switch now. (In reply to Nick Thomas [:nthomas] from comment #3) > We could do this in this order > * merge changes to mozilla-central, pause if they don't stick > * disable birch updates (RelEng does a chmod) > * tweak birch as above and do a set of nightlies (Ehsan) First two are done, nightlies are compiling now. > * verify that the updates does what we expect, then re-enable birch updates > (RelEng+Ehsan, probably need to fake up some update.xml) Start up the MPT VPN. Take the 2012-12-13-04 build or older and create a new string pref app.update.url.override with value http://aus3-staging.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/nightly-birch-test/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml Check for updates, verify that <appdir>/defaults/pref/channel-prefs.js now sets app.update.channel to 'nightly'. This might not work because the birch buildID will be newer than the one offered on m-c, in which case we can wait a day.

From quick peek at the partial and complete mar files for mac this plan should work out. The update manifests have: add "Contents/MacOS/defaults/pref/channel-prefs.js" which contains pref("app.update.channel", "nightly");

Comment on attachment 692013 [details] [diff] [review] [buildbot-configs] Disable nightlies on birch http://hg.mozilla.org/build/buildbot-configs/rev/b6c651e2890b Will get deployed on the next reconfig, which we're having quite a bit recently. Should be OK even if it is delayed and we end up with more nightly builds on birch though, because 36b07580e1fc looks like going green across the board and will get selected as last good revision for new nightlies.

Ehsan did some QA on mac, and the channel changed to nightly (lack of access to aus3-staging meant we had to put xml up on people). I've re-enabled updates on birch. Starting on a reconfig so we don't get any more nightlies.

Reconfig is done.

The cron job on aus3-staging that deletes old nightly snippets has been told to ignore nightly-birch, so that the update path to m-c doesn't disappear real soon now. So far about three quarters of the users have stopped pinging on nightly-birch.

(In reply to comment #15) > The cron job on aus3-staging that deletes old nightly snippets has been told to > ignore nightly-birch, so that the update path to m-c doesn't disappear real > soon now. So far about three quarters of the users have stopped pinging on > nightly-birch. Are there any users pinging that channel now?

3 or 4 the last few days.