455395 - make "Gran Paradiso" branding the default on CVS trunk

Status: VERIFIED FIXED

(Firefox Build System :: General, defect)

Description

[:Gavin Sharp [email: [e-mail]]]

The nightly machines were switched to use the proper "Gran Paradiso" branding, but we still build with the Minefield branding by default. Some linux distros noticed this when they built CVS HEAD and got Minefield.

Comment 1

[:Gavin Sharp [email: [e-mail]]]

Not sure how the icon gets changed. Need to change MOZ_APP_DISPLAYNAME at the very least.

Comment 2

[:Gavin Sharp [email: [e-mail]]]

So we can do this using essentially the same patch as the one in bug 467386. I think the fact that the 1.9.0 build machines are already specifying that branding means that bug 467385 won't be a problem (http://mxr.mozilla.org/seamonkey/search?string=granparadiso.app seems to confirm), but I think we still need to avoid bug 467485 by changing:

http://mxr.mozilla.org/seamonkey/source/tools/buildbot-configs/testing/unittest/mozbuild.py

Comment 3

[:Gavin Sharp [email: [e-mail]]]

Attachment: patch

Who's the best person to review this from RelEng? I'm not sure whether the changes to mozbuild.py require any special attention to push to the production unit test machines.

Comment 4

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

I'd suggest Coop or Lukas to check this given their experience with unit tests. Would need a coordinated landing to prevent bustage.

Comment 5

[Mike Connor [:mconnor]]

Comment on attachment 351711 [details] [diff] [review]
patch

r=me on the browser bits

Comment 6

[Chris Cooper [:coop] (he/him)]

Comment on attachment 351711 [details] [diff] [review]
patch

Now that the changes from bug 456281 have landed, you only need to specify an appname for the *Reftest and *Crashtest steps. All the runtests.py just do the right thing by default. The platform-specific steps that execute runtests have been removed.

r+ with those changes.

Comment 7

[:Gavin Sharp [email: [e-mail]]]

Hmm, none of the patches in bug 456281 have touched mozbuild.py, but I guess attachment 350539 [details] [diff] [review] removed all references to the classes I'm modifying. Should those be cleaned up since they're no longer being used?

And just to make sure, I won't need any kind of manual intervention to have this take effect when landing, right?

Comment 8

[:Gavin Sharp [email: [e-mail]]]

Comment on attachment 351711 [details] [diff] [review]
patch

Should be no impact to release builds, but it'd be nice to get this on branch to be consistent with the other branches.

Comment 9

[Daniel Veditz [:dveditz]]

Comment on attachment 351711 [details] [diff] [review]
patch

Yes, please.

Approved for 1.9.0.10, a=dveditz for release-drivers

Comment 10

[:Gavin Sharp [email: [e-mail]]]

Checked in:
mozilla/browser/confvars.sh 	1.9
mozilla/tools/buildbot-configs/testing/unittest/mozbuild.py 	1.27 

Coop said he'd reconfig the buildbots to pick up the change.

Comment 11

[Chris Cooper [:coop] (he/him)]

Unittest build master has been reconfig-ed.

Comment 12

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

Attachment: Followup to fix mac debug builder

/cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.24.2.12; previous revision: 1.24.2.11 (test_mem branch)

The mac debug builder doesn't explicitly specify branding and tinderbox client requires the actual product name to work.

Comment 13

[:Gavin Sharp [email: [e-mail]]]

Thanks for the infra-assistance, guys.

Comment 14

[Al Billings [:abillings - ex-MoCo]]

This is verified as builds are marked this way now.