1148859 - Uplift to 38 Suggested tiles: Affiliate Release

Status: VERIFIED FIXED

(Firefox :: New Tab Page, defect)

Description

[Ed Lee :Mardak]

All the depends on bugs are the code changes related to bug 1120311. These should also include various followup fixes from baking on Nightly.

Comment 1

[Ed Lee :Mardak]

Whew. I'm so glad I made bug 1057602 comment 9. :)

I've updated the command for suggested tiles picking:

git log gecko/aurora..gecko/master --format='format:pick %h %s' --reverse browser/{base/content{,/test},themes/shared}/newtab browser/{locales/en-US/chrome/browser/newTab.*,modules/DirectoryLinksProvider.jsm} toolkit/modules/NewTabUtils.jsm | grep -vE '(b1046ad|cc4c358|52e2918|f433070)'

Currently, that outputs:

pick aeda557 Bug 1126182: Extract related tiles data from links json and store for later selection. r=adw
pick 7ff3ee3 Bug 1126184: Part 1: Make DirectoryLinksProvider listen to PlacesProvider and update its
pick 5b0c9de Bug 1126184: Part 2: Select a single tile to show as the first unpinned tile based on a
pick a8b4ee0 Bug 1126184: Part 3: Mochitest fixes for suggested tiles.
pick 39a1681 Bug 1126188: Show suggested tile explanation text under a suggested tile. r=adw
pick a4871bd Bug 1126186: Allow users to turn off all tiles that aren't history tiles and update newtab
pick c195c91 Bug 1145410: Return valid results when querying the provider cache while it's empty or being
pick b682e44a Bug 1143797 - Allow clicking on suggested explanation text to see overlay explaining the
pick 95e6c5d Bug 1143745 - Update the way Firefox reads directoryLinks.json sent from the server for the
pick 49c5893 Bug 1136208 - Change all references of 'related' to 'suggested' r=adw
pick edc8b39 Bug 1140496 - Only show a suggested tile url for some number of times or until clicked
pick b81312d Bug 1146249 - Tiles on the newtab page don't wrap properly [r=adw] Calculate the appropriate
pick bf19dc7 Bug 1146146 - Maximize the number of rows of tiles by reducing the suggested explanation
pick a660fe5 Bug 1136203 - Remove thumbnail/title replacing functionality for history tiles. r=adw

The grep -v removes some backed out landings. The "pick" output is used in a "git rebase -i head" where head is on a suggested branch at gecko/aurora and replace the noop with the contents.

Comment 2

[Ed Lee :Mardak]

Attachment: 17 patches combined; Mardak will land as separate commits

emtwo, does this combo patch look good to you? Anything missing?

Comment 3

[Ed Lee :Mardak]

Comment on attachment 8585110 [details] [diff] [review]
17 patches combined; Mardak will land as separate commits

This is a combined patch from the various bugs implementing Suggested Tiles.

Approval Request Comment
[Feature/regressing bug #]: Suggested Tiles Affiliate Release bug 1120311
[User impact if declined]: We're introducing the concept of suggested tiles in Firefox 38 to users with unpaid tiles promoting Mozilla properties, e.g., Firefox for Android, MDN, non-profits. This is ahead of the sponsored suggested tiles to be landing in Firefox 39.
[Describe test coverage new/current, TreeHerder]: The code has landed and baked on Nightly for a few weeks with new unit xpcshell and mochi tests written covering the new logic added. The patches to be uplifted also contains some followup bugs from regressions that have been fixed on Nightly.
[Risks and why]: Lowish as it's a tweak of a feature that doesn't have dependencies. It is new functionality that has been tested behind about:config prefs.
[String/UUID change made/needed]: None. Functionality was implemented in a way to not break string freeze for uplift.

Comment 4

[Sylvestre Ledru [:Sylvestre]]

As you know, we prefer not to land a new feature as late in the aurora cycle.

Could explicit a bit more what kind of testing you have done and what you are planning to do?
If I accept the uplift now, it will land in the first beta of 38 without any testing in aurora.

Comment 5

[Sylvestre Ledru [:Sylvestre]]

Release Note Request (optional, but appreciated)
[Why is this notable]: New cool feature
[Suggested wording]: Suggested tiles
[Links (documentation, blog post, etc)]: do we have anything?

Comment 6

[Marina Samuel [:emtwo]]

(In reply to Ed Lee :Mardak from comment #2)
> Created attachment 8585110 [details] [diff] [review]
> 17 patches combined; Mardak will land as separate commits
> 
> emtwo, does this combo patch look good to you? Anything missing?

This looks good to me, Thanks Ed. I assume we're uplifting the patches in bug 1141617 separately then?

Comment 7

[Marina Samuel [:emtwo]]

Accidentally took off the needinfo set by Sylvestre, replacing

Comment 8

[Ed Lee :Mardak]

(In reply to Sylvestre Ledru [:sylvestre] from comment #4)
> If I accept the uplift now, it will land in the first beta of 38 without any
> testing in aurora.
> Could explicit a bit more what kind of testing you have done and what you
> are planning to do?
I've been thinking through this, and I agree the testing so far has only been obscure opt-in on Nightly mostly from developers and QE, so I would also definitely feel more comfortable with wider testing.

sylvestre, so would it be better for us to turn on affiliate suggested tiles by default on Nightly 40 and uplift immediately to Aurora 39 for wider testing (or if we turn on by default in Nightly 39 in time)? If all looks good, we should aim for uplifting to Beta 38 within a week or two from now?

(In reply to Sylvestre Ledru [:sylvestre] from comment #5)
> [Links (documentation, blog post, etc)]: do we have anything?
pfinch/kghim are preparing the communications of affiliate suggested tiles as well as sponsored suggested tile for various audiences including Firefox users, Mozilla, tech press, ad tech, brands/advertisers.

pfinch/kghim, where are we tracking the updates needed on https://www.mozilla.org/firefox/tiles and https://support.mozilla.org/kb/how-do-sponsored-tiles-work and other pages?

Comment 9

[Liz Henry (:lizzard) (relman/hg->git project)]

Relnoting for 39 aurora as:  Suggested tiles in new tab  (with the link: https://www.mozilla.org/en-US/firefox/tiles/)

Please needinfo me if you would like to change the wording or the link.

Comment 10

[Liz Henry (:lizzard) (relman/hg->git project)]

From talking with Sylvestre on irc, I'm removing this relnote for 39 and he will note it for 38.

Comment 11

[Sylvestre Ledru [:Sylvestre]]

(In reply to Ed Lee :Mardak from comment #8)
> sylvestre, so would it be better for us to turn on affiliate suggested tiles
> by default on Nightly 40 
Could you do that right now?
I don't mind going with beta 1 but we need a clear test plan for QE.

Comment 12

[Kevin Ghim]

(In reply to Ed Lee :Mardak from comment #8)
> (In reply to Sylvestre Ledru [:sylvestre] from comment #4)
> > If I accept the uplift now, it will land in the first beta of 38 without any
> > testing in aurora.
> > Could explicit a bit more what kind of testing you have done and what you
> > are planning to do?
> I've been thinking through this, and I agree the testing so far has only
> been obscure opt-in on Nightly mostly from developers and QE, so I would
> also definitely feel more comfortable with wider testing.
> 
> sylvestre, so would it be better for us to turn on affiliate suggested tiles
> by default on Nightly 40 and uplift immediately to Aurora 39 for wider
> testing (or if we turn on by default in Nightly 39 in time)? If all looks
> good, we should aim for uplifting to Beta 38 within a week or two from now?
> 
> (In reply to Sylvestre Ledru [:sylvestre] from comment #5)
> > [Links (documentation, blog post, etc)]: do we have anything?
> pfinch/kghim are preparing the communications of affiliate suggested tiles
> as well as sponsored suggested tile for various audiences including Firefox
> users, Mozilla, tech press, ad tech, brands/advertisers.
> 
> pfinch/kghim, where are we tracking the updates needed on
> https://www.mozilla.org/firefox/tiles and
> https://support.mozilla.org/kb/how-do-sponsored-tiles-work and other pages?

Important timing to be aware of is: at or around April 15th will be a Suggested Tiles testing campaign launching. Around mid-May, communications will be going out. Exact dates will be coordinated by pfinch.

Comment 13

[Ed Lee :Mardak]

(In reply to Sylvestre Ledru [:sylvestre] from comment #11)
> (In reply to Ed Lee :Mardak from comment #8)
> > sylvestre, so would it be better for us to turn on affiliate suggested tiles
> > by default on Nightly 40 
> Could you do that right now?
I have a patch in bug 1148938 to turn on suggested tiles by default. It should result in a new tab page looking like attachment 8585308 [details].

> I don't mind going with beta 1 but we need a clear test plan for QE.
The test is relatively simple as there isn't too much to suggested tiles (assuming the above mentioned bug 1148938) lands:

1) open several new tab pages
2) confirm that a suggested tile showed up then went away after ~5 new tabs

3) restart firefox
4) open new tab until suggested tile shows
5) switch to "show your top sites" from top-right cog menu
6) confirm only history tiles remain (no suggested or directory tiles)

7) switch back to "show suggested and your top sites"
8) confirm suggested tile returns

Comment 14

[Sylvestre Ledru [:Sylvestre]]

Comment on attachment 8585110 [details] [diff] [review]
17 patches combined; Mardak will land as separate commits

OK, let's do it then :)
If there is too much regressions (or critical issues), we can always backout this patch and do a second build.

Comment 15

[Sylvestre Ledru [:Sylvestre]]

Added for the 38 release notes
with wording "Suggested tiles"

Comment 16

[Sylvestre Ledru [:Sylvestre]]

Ed, when are you planning to land that? We missed beta 1.
Can we postpone that to 39?

Comment 17

[Ed Lee :Mardak]

(In reply to Sylvestre Ledru [:sylvestre] from comment #16)
> Ed, when are you planning to land that? We missed beta 1.
I've been trying to land things in the appropriate order, but fx-team was closed for b2g bustage then mozilla-aurora is still closed after permafail from other uplifts.

> Can we postpone that to 39?
Can I land the changes to mozilla-beta? Do you want me to request ?a-beta as we definitely want to get this in for 38?

Comment 18

[Sylvestre Ledru [:Sylvestre]]

(In reply to Ed Lee :Mardak from comment #17)
> > Can we postpone that to 39?
> Can I land the changes to mozilla-beta? Do you want me to request ?a-beta as
> we definitely want to get this in for 38?
There are many important changes in 38, it is an ESR release, we are going to make a 38.1 release and 37 has some stability issues.
If we could postpone this feature to 39, it would be great (it would save some QA time for the features already in 38).

Comment 19

[Ed Lee :Mardak]

(In reply to Sylvestre Ledru [:sylvestre] from comment #18)
> There are many important changes in 38, it is an ESR release, we are going
> to make a 38.1 release and 37 has some stability issues.
Sorry, I'm confused in a couple ways: 1) affiliate suggested tiles has been scheduled to be part of 38.0 [not 38.1 or 39] at least as of last week and 2) if I didn't run into multiple closed trees less than 24 hours ago, the feature would be landed and on schedule.

The feature was scheduled for 38.0 so that we can run snippets-like messaging to promote Firefox for Android and other Mozilla affiliate tiles as requested by engagement. The 38 release is also a crucial prerequestive to introduce the idea of suggested tiles to users before they encounter sponsored suggested tiles in 39 to hit Firefox and Content Services goals.

I agree that we haven't had extensive testing, but we're on by default in Nightly 40 and will be for Aurora 39, and we were good to get the additional test coverage in 38 beta 1 just yesterday. So instead of getting beta test coverage from Tuesday-Friday in the timeframe of beta1-beta2, we'll have Nightly and Aurora coverage instead. And hopefully we'll have Nightly, Aurora, and Beta test coverage in beta2-beta3 timeframe.

Comment 20

[Sylvestre Ledru [:Sylvestre]]

(In reply to Ed Lee :Mardak from comment #19)
> (In reply to Sylvestre Ledru [:sylvestre] from comment #18)
> > There are many important changes in 38, it is an ESR release, we are going
> > to make a 38.1 release and 37 has some stability issues.
> Sorry, I'm confused in a couple ways: 1) affiliate suggested tiles has been
> scheduled to be part of 38.0 [not 38.1 or 39] at least as of last week and
> 2) if I didn't run into multiple closed trees less than 24 hours ago, the
> feature would be landed and on schedule.
Yes, I had second thoughts about it... Sorry for the confusion.

> The feature was scheduled for 38.0 so that we can run snippets-like
> messaging to promote Firefox for Android and other Mozilla affiliate tiles
> as requested by engagement. The 38 release is also a crucial prerequestive
> to introduce the idea of suggested tiles to users before they encounter
> sponsored suggested tiles in 39 to hit Firefox and Content Services goals.
Are you going to commit maintaining it for the whole 38 esr cycle too? (8 months)

Comment 21

[Ed Lee :Mardak]

(In reply to Sylvestre Ledru [:sylvestre] from comment #20)
> Are you going to commit maintaining it for the whole 38 esr cycle too? (8
> months)
After some discussion, yes, and we can maintain for ESR even better with the addition of bug 1149680 to be able to differentiate esr vs release (vs beta/aurora/nightly) from our servers.

Comment 22

[Patrick Finch]

(In reply to Kevin Ghim from comment #12)
> (In reply to Ed Lee :Mardak from comment #8)
> > (In reply to Sylvestre Ledru [:sylvestre] from comment #4)
> > > If I accept the uplift now, it will land in the first beta of 38 without any
> > > testing in aurora.
> > > Could explicit a bit more what kind of testing you have done and what you
> > > are planning to do?
> > I've been thinking through this, and I agree the testing so far has only
> > been obscure opt-in on Nightly mostly from developers and QE, so I would
> > also definitely feel more comfortable with wider testing.
> > 
> > sylvestre, so would it be better for us to turn on affiliate suggested tiles
> > by default on Nightly 40 and uplift immediately to Aurora 39 for wider
> > testing (or if we turn on by default in Nightly 39 in time)? If all looks
> > good, we should aim for uplifting to Beta 38 within a week or two from now?
> > 
> > (In reply to Sylvestre Ledru [:sylvestre] from comment #5)
> > > [Links (documentation, blog post, etc)]: do we have anything?
> > pfinch/kghim are preparing the communications of affiliate suggested tiles
> > as well as sponsored suggested tile for various audiences including Firefox
> > users, Mozilla, tech press, ad tech, brands/advertisers.
> > 
> > pfinch/kghim, where are we tracking the updates needed on
> > https://www.mozilla.org/firefox/tiles and
> > https://support.mozilla.org/kb/how-do-sponsored-tiles-work and other pages?
> 
> Important timing to be aware of is: at or around April 15th will be a
> Suggested Tiles testing campaign launching. Around mid-May, communications
> will be going out. Exact dates will be coordinated by pfinch.

What Kevin said - we do not have comms ready for Beta, which is why we've been trying to establish what code lands when.  We cannot run with what is currently here: https://www-dev.allizom.org/en-US/firefox/38.0beta/releasenotes/

Comment 23

[Patrick Finch]

(In reply to Patrick Finch from comment #22)
>

Followed up with Ed.  The release notes should read

Suggested Tiles: landing interest-based promoted content, only in en-US builds in Fx38. More at the [Tiles wiki https://wiki.mozilla.org/Tiles]

Comment 24

[Ed Lee :Mardak]

Ha. Just to note this somewhere. For a moment, I was very confused why my scripts weren't picking up commits for bug 1126183 when doing "git log gecko/beta..gecko/fx-team" of new tab changes. That bug landed back in February in time for Nightly 38, so no need to uplift that patch.

Comment 25

[Ed Lee :Mardak]

The patches look good on fx-team and aurora. I pushed to try and that looks good too.

1) get picks for relevant patches that are on fx-team that aren't on beta

$ git log gecko/beta..gecko/fx-team --format='format:pick %h %s' --reverse browser/{base/content{,/test},themes/shared}/newtab browser/{locales/en-US/chrome/browser/newTab.*,modules/DirectoryLinksProvider.jsm} toolkit/modules/NewTabUtils.jsm | grep -vE '(b1046ad|cc4c358|52e2918|f433070|fa8436c)'

2) git rebase -i with the output and add a pick for bug 1148862's patch (not landed on fx-team yet so that temporary test bug 1148938 continues) and reword commit message

3) covert git commits into hg importable patches

$ git sh gecko/beta..suggested --reverse --format='format:# HG changeset patch%n# User %an <%ae>%n# Date %ad%n%B'

4) hg pull -u beta to the default branch

5) hg import the output of (3) above

6) hg out -r tip beta sanity check

7) hg push -r tip beta

https://hg.mozilla.org/releases/mozilla-beta/pushloghtml?changeset=daf8a9291a9b

Comment 26

[Ed Lee :Mardak]

verify steps:

0) about:config "browser.newtabpage.directory.source" ->
https://people.mozilla.org/~elee/suggested.unicorn.json

This is needed because we uplifted directly to bug 1148862 skipping the temporary bug 1148938. 

(In reply to Ed Lee :Mardak from comment #13)
> 1) open several new tab pages
> 2) confirm that a suggested tile showed up then went away after ~5 new tabs
> 
> 3) restart firefox
> 4) open new tab until suggested tile shows
> 5) switch to "show your top sites" from top-right cog menu
> 6) confirm only history tiles remain (no suggested or directory tiles)
> 
> 7) switch back to "show suggested and your top sites"
> 8) confirm suggested tile returns

Comment 27

[Cornel Ionce [:noni] [Hubs QA]]

Successfully verified with Firefox 38 beta 4, build ID: 20150413143743 on Windows 7 64-bit, Windows 8.1 64-bit, Ubuntu 12.04 32-bit and Mac OS X 10.9.5.