...which makes the sheriffs very sad :-( For example: B2G Unagi opt first run... https://tbpl.mozilla.org/php/getParsedLog.php?id=27098597&tree=Mozilla-Central (used gaia d5e7d4c39dee68dc7f3558980804ce8ea0015790) Retrigger of same job... https://tbpl.mozilla.org/php/getParsedLog.php?id=27112329&tree=Mozilla-Central (used gaia 4292d74f14438b49ebd01a4dbf89fd2748926f16) (There are likely more job types, will have to try and find examples)

So I imagine everything done by b2g_build.py [1] is affected. I forget, does gaia.json refer to a git or hg revision? [1] http://hg.mozilla.org/build/mozharness/file/default/scripts/b2g_build.py

hg

That's accurate. We only put this in place for b2g desktop.

Looks like we're calling b2g_build.py with the following params: { --target unagi --config b2g/releng-beta.py --gaia-languages-file locales/languages_dev.json --gecko-languages-file gecko/b2g/locales/all-locales } We want it to be using the gaia rev specified in the tree: https://hg.mozilla.org/mozilla-central/file/tip/b2g/config/gaia.json Similar to: https://hg.mozilla.org/build/buildbot-configs/file/e18dc871d29a/mozilla/b2g_config.py#l59 -> https://hg.mozilla.org/build/buildbotcustom/file/e09ee7610d5b/misc.py#l1199 -> https://hg.mozilla.org/build/buildbotcustom/file/e09ee7610d5b/process/factory.py#l1182

I'm going to do this as part of bug 899969 if that's alright. We will still keep gaia.json for desktop builds, but device builds will use per-device sources.xml.