1195397 - for aurora -> beta: l10n-mozconfig needs "ac_add_options --with-branding=browser/branding/aurora" removed

Status: RESOLVED FIXED

(Release Engineering :: Release Automation: Other, defect)

Description

[Jordan Lund (:jlund)]

as per https://bugzilla.mozilla.org/show_bug.cgi?id=1178507#c13

Comment 1

[Rail Aliiev [:rail]]

Figure out what files are changed by http://hg.mozilla.org/mozilla-central/file/a6eeb28458fd/testing/mozharness/configs/merge_day/central_to_aurora.py and revert them in http://hg.mozilla.org/mozilla-central/file/a6eeb28458fd/testing/mozharness/configs/merge_day/aurora_to_beta.py

I think this should fix it.

Comment 2

[Jordan Lund (:jlund)]

I'm going to look at this now

Comment 3

[Jordan Lund (:jlund)]

so running `python mozharness/scripts/merge_day/gecko_migration.py -c mozharness/configs/merge_day/aurora_to_beta.py` yields the following output:
     http://people.mozilla.org/~jlund/beta_diff.log

parsing the output and grepping for --with-branding shows some pretty random lines. I see some files replacing 'aurora' with 'nightly' but others replacing 'aurora' with 'beta'.

I'm a bit confused about what we should expect here given the above diff log.

nthomas: it looks like all the --with-branding lines that mention aurora are replaced but I'm not sure if they should be 'nightly' or 'beta'. I'd assume nightly but the mix seems odd

Comment 4

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

Desktop should be setting nightly, and the the release automation overrides that http://hg.mozilla.org/build/tools/file/default/lib/python/build/l10n.py#l70. Android needs to be setting beta, so all is well ?

Ideally browser/config/version_display.txt would say 42.0b1 instead of 42.0, but the tagging will fix that up if we don't. Bug 1175331 seems to have stalled on that. Relatedly, bug 1196373 will probably land on aurora before the merge, so that'll remove the mobile/android/confvars.sh change. Not sure if we need to handle that change in the migration script, or if it will continue without error if it finds nothing to replace.

Comment 5

[Rail Aliiev [:rail]]

(In reply to Nick Thomas [:nthomas] from comment #4)
> Relatedly, bug 1196373 will probably land on aurora before
> the merge, so that'll remove the mobile/android/confvars.sh change. Not sure
> if we need to handle that change in the migration script, or if it will
> continue without error if it finds nothing to replace.

This is handled by https://bugzilla.mozilla.org/show_bug.cgi?id=1190766#c9 and will ride the trains. The current approach is to fail if we can't bump something rather than silently skipping.

Comment 6

[Rail Aliiev [:rail]]

Sounds like this should be already resolved or should I get coffee? :)

Comment 7

[Jordan Lund (:jlund)]

I suppose we are good then

Comment 8

[Rail Aliiev [:rail]]

Looks like we need to tweak some configs.

Comment 9

[Rail Aliiev [:rail]]

Attachment: beta_l10n.diff

This is the diff https://gist.github.com/rail/ddb3551d30af9e7eeac1
(I had to remove mobile/android/confvars.sh from the list, pretending that I merge for gecko 43)

The list of files comes from https://bugzilla.mozilla.org/attachment.cgi?id=8663957&action=edit

Comment 10

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/f1ee39653039

Comment 11

[Rail Aliiev [:rail]]

Comment on attachment 8663993 [details] [diff] [review]
beta_l10n.diff

https://hg.mozilla.org/integration/mozilla-inbound/rev/f1ee39653039

Comment 12

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/f1ee39653039