Bug 1212616 - Setup updates for b2gdroid, r=catlee

testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11_b2gdroid.py

@@ -5,4 +5,5 @@ config = {
     'src_mozconfig': 'mobile/android/b2gdroid/config/mozconfigs/nightly',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest',
     'multi_locale_config_platform': 'android',
+    'enable_nightly_promotion': True,
 }

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -814,6 +814,11 @@ or run without that action (ie: --no-{action})"
         self.info("Skipping......")
         return
 
+    def query_is_nightly_promotion(self):
+        platform_enabled = self.config.get('enable_nightly_promotion')
+        branch_enabled = self.branch in self.config.get('nightly_promotion_branches')
+        return platform_enabled and branch_enabled
+
     def query_build_env(self, replace_dict=None, **kwargs):
         c = self.config
 
@@ -833,7 +838,7 @@ or run without that action (ie: --no-{action})"
         # first grab the buildid
         env['MOZ_BUILD_DATE'] = self.query_buildid()
 
-        if self.query_is_nightly():
+        if self.query_is_nightly() or self.query_is_nightly_promotion():
             env["IS_NIGHTLY"] = "yes"
             # in branch_specifics.py we might set update_channel explicitly
             if c.get('update_channel'):

testing/mozharness/scripts/fx_desktop_build.py

@@ -76,6 +76,7 @@ class FxDesktopBuild(BuildScript, object):
                 'compare_locales_vcs': 'hgtool',
                 'influx_credentials_file': 'oauth.txt',
                 'build_resources_path': '%(abs_src_dir)s/obj-firefox/.mozbuild/build_resources.json',
+                'nightly_promotion_branches': ['mozilla-central', 'mozilla-aurora'],
 
                 # try will overwrite these
                 'clone_with_purge': False,