1178785 - Mac nightly l10n repacks busted

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Rail Aliiev [:rail]]

See https://treeherder.mozilla.org/logviewer.html#?job_id=927855&repo=mozilla-aurora


06:18:33 INFO - FirefoxDeveloperEdition.app/Contents/Resources/res/cursors/[e-mail]
06:18:33 INFO - FirefoxDeveloperEdition.app/Contents/Resources/webapprt/
06:18:33 INFO - FirefoxDeveloperEdition.app/Contents/Resources/webapprt/omni.ja
06:18:33 INFO - FirefoxDeveloperEdition.app/Contents/Resources/webapprt/webapprt.ini
06:18:33 INFO - FirefoxDeveloperEdition.app/Contents/_CodeSignature/
06:18:33 INFO - FirefoxDeveloperEdition.app/Contents/_CodeSignature/CodeResources
06:18:33 INFO - sent 324883183 bytes received 2648 bytes 13824928.98 bytes/sec
06:18:33 INFO - total size is 324834692 speedup is 1.00
06:18:33 INFO - "disk3" unmounted.
06:18:33 INFO - "disk3" ejected.
06:18:38 INFO - + rsync -a /builds/slave/m-aurora-m64-l10n-ntly-6-00000/build/mozilla-aurora/obj-l10n/dist/unpack.tmp/Nightly.app firefox
06:18:38 INFO - rsync: link_stat "/builds/slave/m-aurora-m64-l10n-ntly-6-00000/build/mozilla-aurora/obj-l10n/dist/unpack.tmp/Nightly.app" failed: No such file or directory (2)
06:18:38 INFO - rsync error: some files could not be transferred (code 23) at /SourceCache/rsync/rsync-42/rsync/main.c(992) [sender=2.6.9]
06:18:38 INFO - make: *** [/builds/slave/m-aurora-m64-l10n-ntly-6-00000/build/mozilla-aurora/obj-l10n/dist/l10n-stage/firefox/Nightly.app/Contents/Resources] Error 23
06:18:38 ERROR - Return code: 2
06:18:38 ERROR - 2 not in success codes: [0]
06:18:38 WARNING - setting return code to 2
06:18:38 FATAL - Halting on failure while running ['make', 'unpack']
06:18:38 FATAL - Running post_fatal callback...
06:18:38 FATAL - Exiting 2
program finished with exit code 2
elapsedTime=565.349307

Comment 1

[Michael Shal [:mshal]]

I think browser/confvars.sh should have:

MOZ_BRANDING_DIRECTORY=browser/branding/aurora

instead of:

MOZ_BRANDING_DIRECTORY=browser/branding/unofficial

Does that sound right? I tested this locally, and it changes MOZ_APP_DISPLAYNAME from 'Nightly' to 'FirefoxDeveloperEdition', which is the variable used in the rsync command that is failing (the dmg file contains FirefoxDeveloperEdition.app, not Nightly.app).

Comment 2

[Rail Aliiev [:rail]]

Hmmm, I think in bug 1157289 we wanted to stop touching that... Maybe we should add "ac_add_options --with-branding=browser/branding/aurora" to http://hg.mozilla.org/releases/mozilla-aurora/file/f77a4ceb2389/browser/config/mozconfigs/macosx64/l10n-mozconfig and for other platforms as well?

Comment 3

[Michael Shal [:mshal]]

I can confirm that using ac_add_options also works (locally by checking MOZ_APP_DISPLAYNAME in config.status), though the mozconfig used is macosx-universal/l10n-mozconfig. The macosx64/l10n-mozconfig file doesn't appear to be referenced anywhere.

Comment 4

[Michael Shal [:mshal]]

Attachment: aurora-mac-l10n-branding

I'm testing this on staging at the moment.

Comment 5

[Rail Aliiev [:rail]]

Comment on attachment 8627786 [details] [diff] [review]
aurora-mac-l10n-branding

Can you add this line to other platforms to be consistent?

I think we should also apply this to m-c as well.

Comment 6

[Michael Shal [:mshal]]

Attachment: aurora-l10n-branding

Comment 7

[Michael Shal [:mshal]]

Attachment: 0001-Bug-1178785-Add-with-branding-to-browser-l10n-mozcon.patch

And for m-c.

Comment 8

[Michael Shal [:mshal]]

Comment on attachment 8627889 [details] [diff] [review]
aurora-l10n-branding

Approval Request Comment
[Feature/regressing bug #]:
[User impact if declined]: OSX l10n busted
[Describe test coverage new/current, TreeHerder]: Tested OSX in a staging environment
[Risks and why]: 
[String/UUID change made/needed]:

Comment 9

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/44561e7653ed

Comment 10

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/44561e7653ed

Comment 11

[Rail Aliiev [:rail]]

Still need to land on m-a

Comment 12

[Ryan VanderMeulen [:RyanVM]]

Status flags track branch uplifts. Resolution tracks landing on m-c.

Comment 13

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

Comment on attachment 8627889 [details] [diff] [review]
aurora-l10n-branding

Aurora+ Sorry that we missed this earlier.

Comment 14

[Chris AtLee [:catlee]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/9e3ac44b2d1d

Comment 15

[Chris AtLee [:catlee]]

mshal just informed me I pushed the wrong patch - thanks!

backed out the previous one and pushed the correct one instead:
https://hg.mozilla.org/releases/mozilla-aurora/rev/ae18ebff50df

Comment 16

[Axel Hecht [:Pike]]

Got my aurora update today, marking fixed 41.

Comment 17

[DJ-Leith]

I wonder if this caused this report?
Fx 41.0a2 (2015-07-03) claims to be Nightly, should be DeveloperEdition
Bug 1180336

I saw this using Windows.

Screenshot 2015-07-03
https://bug1180336.bugzilla.mozilla.org/attachment.cgi?id=8629535

The Menus all have (had on 2015-07-04) "Nightly".
For example "Nightly Help", "Nightly Tour", "Nightly Health Report" etc.

See also other reports here:
http://forums.mozillazine.org/viewtopic.php?f=23&t=2945003

However, all seems to be 'back to normal' now.

See screenshot 2015-07-05
https://bug1180336.bugzilla.mozilla.org/attachment.cgi?id=8629664

Menus now say
"Firefox Help", "Firefox Tour", "Firefox Health Report" etc.

Is this expected?  I can't remember is they used to say
"Firefox" or "DeveloperEdition" e.g. "DeveloperEdition Tour".

DJ-Leith

Comment 18

[Rail Aliiev [:rail]]

I commented in bug 1180336 (and closed it). It was caused by this bug.