There's two currently identified changes needed: * use a separate config for devedition instead of testing/mozharness/configs/single_locale/{,dev}-mozilla-beta.py to specify "update_channel" as "aurora{,-dev}" * fix mac repacks to use FirefoxDeveloperEdition.app instead of Firefox.app, see https://archive.mozilla.org/pub/devedition/tinderbox-builds/jamun-l10n/release-jamun_devedition_macosx64_l10n_repack-bm86-build1-build31.txt.gz More may come up as we get further into testing.

We probably should use "ac_add_options --with-branding=browser/branding/aurora" in l10n-mozconfig.

the above three patches should fix the app name (branding) and update_channel issues. this is untested and might not even pass checkconfig as I don't have that setup locally atm but that's what travis is for :) it's not the cleanest solution but meh, it was harder without linux_devedition and linux64_devedition defined in config.py and that seemed like overkill for just one config item. also of note, I stumbled on this[1] from release sanity. This will no longer tell the truth for the devedition case but, for now, I think that is okay since we only use that to check the l10n cset url (which is the same for both firefox and devedition) [1] https://dxr.mozilla.org/build-central/source/tools/lib/python/kickoff/sanity/l10n.py#11

Comment on attachment 8868793 [details] Bug 1365588 - fix l10n repacks for DevEdition on Beta, gecko, https://reviewboard.mozilla.org/r/140390/#review144068

Comment on attachment 8868794 [details] Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbotcustom, https://reviewboard.mozilla.org/r/140394/#review144070

Comment on attachment 8868795 [details] Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbot-cfgs, https://reviewboard.mozilla.org/r/140398/#review144072

Comment on attachment 8868794 [details] Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbotcustom, https://hg.mozilla.org/build/buildbotcustom/rev/64cfcddf9a27c39d84b53cd9091c27a939dbace1

Comment on attachment 8868795 [details] Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbot-cfgs, https://hg.mozilla.org/build/buildbot-configs/rev/ec08ff934f1dd786518ee9a052f3e1a625b5b000

Comment on attachment 8868793 [details] Bug 1365588 - fix l10n repacks for DevEdition on Beta, gecko, Pushed to jamun for testing: https://hg.mozilla.org/projects/jamun/rev/9cee0e8b00d28d7e977df6ee3e1adc9680004b8d

+ bustage fix: https://hg.mozilla.org/build/buildbot-configs/rev/1fdba52e1175c8f0c6ef5d4bc490ec524b32df12

In production: https://hg.mozilla.org/build/buildbot-configs/rev/ec08ff934f1d

In production: https://hg.mozilla.org/build/buildbot-configs/rev/1fdba52e1175

In production: https://hg.mozilla.org/build/buildbotcustom/rev/64cfcddf9a27

staging release: https://tools.taskcluster.net/task-group-inspector/#/5k1TaizeRa63BGb0mmlc0g/?_k=rudei8

rail> jlund|away: it's green! want to me to spread it everywhere? 09:10:50 jlund|away → jlund 09:11:15 <jlund> Jordan Lund rail: everywhere meaning up to beta? I can do that 09:11:24 <rail> yup

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. hg error in cmd: hg rebase -s 9538e073f0dd -d b8d0fdf79562: rebasing 396650:9538e073f0dd "Bug 1365588 - fix l10n repacks for DevEdition on Beta, gecko, r=rail" (tip) merging browser/config/mozconfigs/linux32/l10n-mozconfig and browser/config/mozconfigs/linux32/l10n-mozconfig-devedition to browser/config/mozconfigs/linux32/l10n-mozconfig-devedition merging browser/config/mozconfigs/linux64/l10n-mozconfig and browser/config/mozconfigs/linux64/l10n-mozconfig-devedition to browser/config/mozconfigs/linux64/l10n-mozconfig-devedition merging browser/config/mozconfigs/macosx64/l10n-mozconfig and browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition to browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition merging browser/config/mozconfigs/win32/l10n-mozconfig and browser/config/mozconfigs/win32/l10n-mozconfig-devedition to browser/config/mozconfigs/win32/l10n-mozconfig-devedition merging browser/config/mozconfigs/win64/l10n-mozconfig and browser/config/mozconfigs/win64/l10n-mozconfig-devedition to browser/config/mozconfigs/win64/l10n-mozconfig-devedition merging testing/mozharness/configs/single_locale/dev-mozilla-beta.py and testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py to testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py merging testing/mozharness/configs/single_locale/win32.py and testing/mozharness/configs/single_locale/win32_devedition.py to testing/mozharness/configs/single_locale/win32_devedition.py merging testing/mozharness/configs/single_locale/win64.py and testing/mozharness/configs/single_locale/win64_devedition.py to testing/mozharness/configs/single_locale/win64_devedition.py warning: conflicts while merging browser/config/mozconfigs/linux32/l10n-mozconfig-devedition! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/config/mozconfigs/linux64/l10n-mozconfig-devedition! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/config/mozconfigs/win32/l10n-mozconfig-devedition! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/config/mozconfigs/win64/l10n-mozconfig-devedition! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)

https://hg.mozilla.org/integration/mozilla-inbound/rev/212e630c4ee4ccec0e47e8567380ef55a02e6d5a Bug 1365588 - fix l10n repacks for DevEdition on Beta, gecko, DONTBUILD, r=rail

uplifted to beta https://hg.mozilla.org/releases/mozilla-beta/rev/51c849c595a0b5428d1d56e4ae668653437283e2