Merge from mozilla-central to mozilla-aurora happening TOMORROW (2011-04-12) at 6:00 am PDT
Christian Legnitto
----------------------
* The merge from mozilla-central to mozilla-aurora happening TOMORROW (2011-04-12) at ~6:00 am PDT.
Details
----------------------
There is some discussion as to what "merge on 2011-04-12" means. It is generally open to two interpretations:
#1 - Developers can land fixes up to 11:59 pm PDT on 2011-04-12 and the actual merge will happen on 2011-04-13 PDT
#2 - Developers can land fixes up to the merge point, which happens sometime on 2011-04-12
_We are going with #2 above and intend to do the merge @ ~6:00 am PDT_
How will you know the merge is done / mozilla-central is tracking for Firefox 6 instead of 5?
There will be a version bump on mozilla-central to 6.0a1 (see bug https://bugzilla.mozilla.org/show_bug.cgi?id=648653). Anything before that will make Firefox 5 (if no issues are found) and anything after that will make Firefox 6.
What happens if the version bump hasn't happened and it is after 6:00 am PDT? We've decided to give some more time, you can still land for Firefox 5 (likely for < 24 hours).
Please use best judgement when pushing late tonight and tomorrow. We will NOT be closing the tree...normal mozilla-central rules apply.
Thanks,
Christian
Axel Hecht
What needs to be done is getting l10n-aurora/* set up for the 88 locales
we're building as defined by browser/locales/all-locales, with the
l10n-central content, plus builds for that for all the 88 locales.
Somehow trying to figure out the jetlag between the branch (6am) and the
branch meeting (11:30 am).
Axel
Christian Legnitto
On Apr 11, 2011, at 6:41 PM, Axel Hecht wrote:
> Who's driving l10n mechanics to completion by then?
John O'Duinn is driving those. I believe there is some discussion on how best to structure them, yes? This doesn't impact the mozilla-central -> mozilla-aurora merge as far as I can see.
> What needs to be done is getting l10n-aurora/* set up for the 88 locales we're building as defined by browser/locales/all-locales, with the l10n-central content, plus builds for that for all the 88 locales.
>
Again, I think there is some contention on the proper layout. How are the l10n builds handled for mozilla-central nightlies (if at all)? Because the messaging is going to be en-US only for now I don't believe having all the locales in place is critical...but feel free to disagree.
> Somehow trying to figure out the jetlag between the branch (6am) and the branch meeting (11:30 am).
Just the way it worked out. The 11:30 meeting will see where we are at and deal with any issues encountered / loose ends we forgot. We don't need a meeting to do a hg pull and push with automated dep builds. Additionally, it will be a good checkpoint before we start messaging for users to download the builds. In the future merges will likely take place in a scheduled meeting, sort of like triage is now.
Thanks,
Christian
>
> Axel
>
> On 11.04.11 16:44, Christian Legnitto wrote:
>> Summary
>> ----------------------
>>
>> * The merge from mozilla-central to mozilla-aurora happening TOMORROW (2011-04-12) at ~6:00 am PDT.
>>
>> Details
>> ----------------------
>>
>> There is some discussion as to what "merge on 2011-04-12" means. It is generally open to two interpretations:
>>
>> #1 - Developers can land fixes up to 11:59 pm PDT on 2011-04-12 and the actual merge will happen on 2011-04-13 PDT
>> #2 - Developers can land fixes up to the merge point, which happens sometime on 2011-04-12
>>
>> _We are going with #2 above and intend to do the merge @ ~6:00 am PDT_
>>
>> How will you know the merge is done / mozilla-central is tracking for Firefox 6 instead of 5?
>>
>> There will be a version bump on mozilla-central to 6.0a1 (see bug https://bugzilla.mozilla.org/show_bug.cgi?id=648653). Anything before that will make Firefox 5 (if no issues are found) and anything after that will make Firefox 6.
>>
>> What happens if the version bump hasn't happened and it is after 6:00 am PDT? We've decided to give some more time, you can still land for Firefox 5 (likely for< 24 hours).
>>
>> Please use best judgement when pushing late tonight and tomorrow. We will NOT be closing the tree...normal mozilla-central rules apply.
>>
>> Thanks,
>> Christian
>>
>
> _______________________________________________
> dev-planning mailing list
> dev-pl...@lists.mozilla.org
> https://lists.mozilla.org/listinfo/dev-planning
Axel Hecht
How are we going to ship beta without aurora or release without beta?
We need the aurora repos up, all 88 of them, now. We need localizers to
work on Fx5 now.
There should be no discussion on structure, there's a clear mapping in
naming that's given by mozilla-central -> l10n-central or
releases/mozilla-2.0 -> releases/l10n-mozilla-2.0. l10n-aurora it is,
it's been that way since Thursday, assuming that the name of the en-US
repo stuck.
Axel
Christian Legnitto
On Apr 11, 2011, at 10:29 PM, Axel Hecht wrote:
> Sorry, but this doesn't make any sense at all.
Ok.
> How are we going to ship beta without aurora or release without beta?
Did anyone suggest this?
> We need the aurora repos up, all 88 of them, now.
I question this assertion. Do we need the repos in place to do the merge from mozilla-central and get an en-US build out tomorrow? No. Will we have nightly builds for the next 5 weeks off mozilla-aurora, which can and will be localized when we get the repos in place? Yes.
Of course, the longer we wait the less l10n coverage...I get that. We want to do it asap. I'm just pointing out I don't think this is "need to have it yesterday" critical and I don't think it impacts the merge and automatic en-US dep build tomorrow. Am I mistaken?
> We need localizers to work on Fx5 now.
True. I'm also taking the position that a couple days off of mozilla-aurora's 5 week schedule when (as it appears to me) very little l10n-impacting UI work has taken place on mozilla-central isn't the end of the world. This is the first one, it's going to be slightly messy unfortunately...
> There should be no discussion on structure, there's a clear mapping in naming that's given by mozilla-central -> l10n-central or releases/mozilla-2.0 -> releases/l10n-mozilla-2.0. l10n-aurora it is, it's been that way since Thursday, assuming that the name of the en-US repo stuck.
I don't really care personally fwiw. I just know there was desire expressed to have everything under l10n/ such as l10n/mozilla-central, l10n/mozilla-aurora, etc. That proposal had a concrete reason (to reduce the customization needed in hgweb to hide repos). I don't see why that is any less clear, but I also do not know the intricacies on RelEng and l10n's side.
I know John O'Duinn was going to schedule a meeting with you tomorrow to discuss but he was too swamped to do so today...expect that meeting invite tomorrow.
Thanks,
Christian
sayrer
>> We need the aurora repos up, all 88 of them, now.
>
> I question this assertion.
Yeah, same here. We've worked really hard to communicate everything about this process, and every measure we'll take to get up and running. The fact that a merge is happening tomorrow doesn't mean that communication will stop. Let's do the merge and keep working to refine the process.
- Rob
sayrer
>> We need the aurora repos up, all 88 of them, now.
>
> I question this assertion.
Yeah, same here. We've worked really hard to communicate everything about this process, and every measure we'll take to get up and running. The fact that a merge is happening tomorrow doesn't mean that communication will stop. Let's do the merge and keep working to refine the process.
- Rob
Axel Hecht
you're doing when.
Given that other folks are changing my travel plans, I can't commit to
have the l10n things up in a reasonable amount of time once you figure
it out.
We'll see by when we get where when we get there.
Axel
beltzner
> This doesn't work out, guys. Bottom line, I have no clue what you think
> you're doing when.
It seems to me that Rob and Christian are saying that the merge from
mozilla-central to mozilla-aurora is not blocked on having localized
builds set up, but the merge from mozilla-aurora to mozilla-beta will
not happen until we've got the localization infrastructure set up
(either on mozilla-aurora, mozilla-beta, or both). That feels like the
right approach to me, as well.
> Given that other folks are changing my travel plans, I can't commit to have
> the l10n things up in a reasonable amount of time once you figure it out.
Who can run point for l10n in your absence? There's 5 weeks before
merge-down to beta, are you gone for that entire time?
cheers,
mike
Axel Hecht
> On Tue, Apr 12, 2011 at 2:24 PM, Axel Hecht<l1...@mozilla.com> wrote:
>> This doesn't work out, guys. Bottom line, I have no clue what you think
>> you're doing when.
>
> It seems to me that Rob and Christian are saying that the merge from
> mozilla-central to mozilla-aurora is not blocked on having localized
> builds set up, but the merge from mozilla-aurora to mozilla-beta will
> not happen until we've got the localization infrastructure set up
> (either on mozilla-aurora, mozilla-beta, or both). That feels like the
> right approach to me, as well.
I don't really care when we're doing en-US, it doesn't matter for l10n.
What I care about is when l10n is up, and I don't see any timeline.
>> Given that other folks are changing my travel plans, I can't commit to have
>> the l10n things up in a reasonable amount of time once you figure it out.
>
> Who can run point for l10n in your absence? There's 5 weeks before
> merge-down to beta, are you gone for that entire time?
We're a team of 5, and I can try to get one person to be a backup, if I
know when. The obvious candidate would be gandalf, but of course, he's
also traveling this week.
That folks come up now with that we'll eventually have l10n builds,
that's nothing that the l10n team and community is going to make up for.
If we'll eventually have builds, we'll eventually release. No point to
talk about one without the other.
Axel
Boris Zbarsky
> How will you know the merge is done / mozilla-central is tracking for Firefox 6 instead of 5?
>
> There will be a version bump on mozilla-central to 6.0a1 (see bug https://bugzilla.mozilla.org/show_bug.cgi?id=648653). Anything before that will make Firefox 5 (if no issues are found) and anything after that will make Firefox 6.
Looks like this happened.
I took the liberty to add "mozilla6" target milestones to Core and
Toolkit in bugzilla and add "Firefox 6" to Firefox.
I also renamed "mozilla2.2" to "mozilla5" and "Firefox 4.2" to "Firefox 5".
-Boris
John O'Duinn
On 4/11/11 6:57 PM, Christian Legnitto wrote:
> On Apr 11, 2011, at 6:41 PM, Axel Hecht wrote:
> I believe there is some discussion on how best to structure them, yes? This doesn't impact the mozilla-central -> mozilla-aurora merge as far as I can see.
Correct, this does not block the move from mozilla-central to
mozilla-aurora.
Closing the loop after several hours of discussions today with Axel,
legneato and NoahM in IT:
1) The l10n repos for mozilla-aurora will be created in:
http://hg.mozilla.org/releases/l10n/mozilla-aurora/{ar...zh}
2) The l10n repos for mozilla-beta will be created in:
http://hg.mozilla.org/releases/l10n/mozilla-beta/{ar...zh}
3) The curious can follow along in
https://bugzilla.mozilla.org/show_bug.cgi?id=649524 as RelEng work with
IT to create the two sets of 80+ repos. Once these are all in place,
RelEng will enable l10n nightlies, generate nightly l10n updates, etc, etc.
4) NoahM will add "releases/l10n/mozilla-aurora" and
"releases/l10n/mozilla-beta" to the hgweb template at the bottom of
hg.m.o. This is just a stopgap while IT works on the longer term fix for
hgweb. For further details, ping NoahM (IT) or myself.
5) The following repos will remain where they are:
http://hg.mozilla.org/l10n/* (tools for l10n - not l10n strings)
http://hg.mozilla.org/l10n-central
6) Once all these l10n repacks are up-and-running on mozilla-aurora and
mozilla-beta, we'll loop back and look on mozilla-central to see which
locales we should continue to generate nightlies for. We'll also revisit
which locales we should continue to generate nightlies for on FF3.5.x,
FF3.6.x, FF4.0.x. More on this later.
7) With this info, Axel expects to get lots of setup done immediately.
However, if questions come up while Axel is traveling, and then out on
leave, Stas and Gandalf will be covering for Axel.
Axel, Legneato, let me know if I missed anything.
tc
John.
=====
>> What needs to be done is getting l10n-aurora/* set up for the 88 locales we're building as defined by browser/locales/all-locales, with the l10n-central content, plus builds for that for all the 88 locales.
>>
>
> Again, I think there is some contention on the proper layout. How are the l10n builds handled for mozilla-central nightlies (if at all)? Because the messaging is going to be en-US only for now I don't believe having all the locales in place is critical...but feel free to disagree.
>
>
>> Somehow trying to figure out the jetlag between the branch (6am) and the branch meeting (11:30 am).
>
> Just the way it worked out. The 11:30 meeting will see where we are at and deal with any issues encountered / loose ends we forgot. We don't need a meeting to do a hg pull and push with automated dep builds. Additionally, it will be a good checkpoint before we start messaging for users to download the builds. In the future merges will likely take place in a scheduled meeting, sort of like triage is now.
>
> Thanks,
> Christian
>
>>
>> Axel
>>
>> On 11.04.11 16:44, Christian Legnitto wrote:
>>> Summary
>>> ----------------------
>>>
>>> * The merge from mozilla-central to mozilla-aurora happening TOMORROW (2011-04-12) at ~6:00 am PDT.
>>>
>>> Details
>>> ----------------------
>>>
>>> There is some discussion as to what "merge on 2011-04-12" means. It is generally open to two interpretations:
>>>
>>> #1 - Developers can land fixes up to 11:59 pm PDT on 2011-04-12 and the actual merge will happen on 2011-04-13 PDT
>>> #2 - Developers can land fixes up to the merge point, which happens sometime on 2011-04-12
>>>
>>> _We are going with #2 above and intend to do the merge @ ~6:00 am PDT_
>>>
>>> How will you know the merge is done / mozilla-central is tracking for Firefox 6 instead of 5?
>>>
>>> There will be a version bump on mozilla-central to 6.0a1 (see bug https://bugzilla.mozilla.org/show_bug.cgi?id=648653). Anything before that will make Firefox 5 (if no issues are found) and anything after that will make Firefox 6.
>>>
>>> What happens if the version bump hasn't happened and it is after 6:00 am PDT? We've decided to give some more time, you can still land for Firefox 5 (likely for< 24 hours).
>>>
>>> Please use best judgement when pushing late tonight and tomorrow. We will NOT be closing the tree...normal mozilla-central rules apply.
>>>
>>> Thanks,
>>> Christian
>>>
>>