1094286 - Merge Gum back into Aurora

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Joe Walker [:jwalker]]

We will need to close Aurora first.

Comment 1

[Joe Walker [:jwalker]]

Proposed timescale:

Friday 7th Nov

3pm: Stop Aurora updates
4pm: Merge Aurora
5pm onwards: QA

Comment 2

[Lawrence Mandel [:lmandel] (use needinfo)]

ni Nick and Massimo from releng to weigh in on disabling Aurora updates
ni Ryan about closing the Aurora tree from the time we merge Gum until sometime after the anniversary release
ni Lukas, who is managing the 35 release for awareness

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Can I please have some context behind why Aurora needs to be closed?

Comment 4

[Lawrence Mandel [:lmandel] (use needinfo)]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #3)
> Can I please have some context behind why Aurora needs to be closed?

Yes. A very reasonable request. We are planning to announce the dev browser on Monday. The expectation is that this announcement will drive a lot of new users to Aurora, which will become the dev browser. Although we have been clear with the dev tools team that this channel can and does break at times, we should try to minimize the risk of breakage for the Monday announcement so that new users do not end up downloading a bad build. My proposal is to close the tree for several days in order to know what we're going to release on Monday.

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Is comment 1 MVT?

Comment 6

[Joe Walker [:jwalker]]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #5)
> Is comment 1 MVT?

Yes. Where MVT = PST.

Comment 7

[Joe Walker [:jwalker]]

Also, we also need to uplift Bug 1078539 (Add a doorhanger notification for beta users using devtools to promote dev-browser) to beta.

That should probably happen on the 10th so we don't jump the gun and pre-announce via a beta door-hanger.

Comment 8

[Lukas Blakk [:lsblakk] use ?needinfo]

Just checked in with Joe on IRC and to mitigate my concerns about merge stabilization he's confirmed there will be merged try pushes done prior to the official merge on Friday.  

A second point of confirmation is that QA is on board with this plan and will be able to sign off on re-enabling updates by Sunday night (given that we'll be re-enabling these quite early on Monday morning, PT).

Tracy - can you confirm that this is your understanding as well and that you are on board with reporting back on the sign offs by then?

Comment 9

[Tracy Walker [:tracy]]

We would like to go earlier. But in reality, we're going to be swamped with QE work on Friday, so doing the merge any earlier doesn't really help us.  Probably better to allow devs continue to polish up the D-E. We'll go with the proposed Friday afternoon merge and work out who's on for QE before then.

Comment 10

[Nick Thomas [:nthomas] (UTC+12)]

(In reply to Lawrence Mandel [:lmandel] (use needinfo) from comment #2)
> ni Nick and Massimo from releng to weigh in on disabling Aurora updates

That's fine. That can actually be done earlier than 3pm, we just need one of the nightlies to complete so we can change the update rule. They start at 00:40 each day. 

https://wiki.mozilla.org/ReleaseEngineering/How_To/Enable_or_Disable_Updates_on_Aurora is our doc.

Comment 11

[Nick Thomas [:nthomas] (UTC+12)]

To clarify, we don't stop updates, we just point them at them a specific nightly for while on the aurora channel. Meanwhile auroratest keeps pointing to the latest build.

Comment 12

[Rail Aliiev [:rail]]

Aurora updates are frozen now and pointing to 20141107004008.

Comment 13

[Ryan VanderMeulen [:RyanVM]]

I just landed a batch of Aurora uplifts. There are a couple sec bugs on inbound that I want to get uplifted as well before closing Aurora and doing the final merge to gum. I've been in touch with Eddy and will let him know when we're good to go.

Comment 14

[Ryan VanderMeulen [:RyanVM]]

Aurora's sufficiently green and there are no pending approvals waiting on uplift that I can see. I'm closing it now and you can do the merge to Gum whenever suits you.

Comment 15

[Joe Walker [:jwalker]]

Attachment: undo-gum.patch

Comment 16

[Panos Astithas (he/him) [:past] (please ni?)]

Comment on attachment 8519200 [details] [diff] [review]
undo-gum.patch

Review of attachment 8519200 [details] [diff] [review]:
-----------------------------------------------------------------

I think you need to also undo this change:

https://hg.mozilla.org/projects/gum/rev/ed70c889afe8#l2.14

Comment 17

[Joe Walker [:jwalker]]

Attachment: undo-gum.patch

Additional change in configure.in

Comment 18

[Ryan VanderMeulen [:RyanVM]]

I just did the merge back to Aurora at Joe's request. It was a bit later than expected due to a last-minute backout that landed on Gum. I also had to add a dummy changeset with an l10n approval in it to make the string change commit hook happy. I'll be marking the bugs shortly.

Tomorrow's Aurora nightly should contain the merge for QA to begin testing on.

Comment 19

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/222cf02605d2

Comment 20

[Ryan VanderMeulen [:RyanVM]]

Are we good to reopen Aurora?

Comment 21

[Joe Walker [:jwalker]]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #20)
> Are we good to reopen Aurora?

I'm ok with that. From our POV, we're ready, and I've not heard of anything from anyone else to say otherwise.

Comment 22

[Ryan VanderMeulen [:RyanVM]]

So I guess all that needs to be done still is re-enabling updates on Aurora. Then this bug can be closed.

Comment 23

[Sylvestre Ledru [:Sylvestre]]

we reenabled aurora :)

Comment 24

[Panos Astithas (he/him) [:past] (please ni?)]

Closing per comments 22 and 23.