Bug 1213864: revert b2g 2.2r to OTA updates for flame r=rail
authorChris AtLee <catlee@mozilla.com>
Tue, 27 Oct 2015 10:13:35 -0400 (2015-10-27)
changeset 13204 4afe6faac38f137577f3249430f090660236369b
parent 13203 340ace130d1b4ab42507e0702f5d7cd20bc17060
child 13207 ca6796141b023914f2a3399daa9dee39f42fbbc6
push id9373
push usercatlee@mozilla.com
push dateTue, 27 Oct 2015 15:06:39 +0000 (2015-10-27)
reviewersrail
bugs1213864
Bug 1213864: revert b2g 2.2r to OTA updates for flame r=rail
mozilla/b2g_config.py
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1142,16 +1142,23 @@ BRANCHES['mozilla-b2g37_v2_2r']['repo_pa
 BRANCHES['mozilla-b2g37_v2_2r']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_2'
 BRANCHES['mozilla-b2g37_v2_2r']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora'
 BRANCHES['mozilla-b2g37_v2_2r']['start_hour'] = [0]
 BRANCHES['mozilla-b2g37_v2_2r']['start_minute'] = [25]
 BRANCHES['mozilla-b2g37_v2_2r']['periodic_start_minute'] = 30
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['linux64-b2g-haz']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['linux64_gecko']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['flame-kk']['enable_nightly'] = True
+# Bug 1213864: need to continue using OTA for Flame on 2.2r
+BRANCHES['mozilla-b2g37_v2_2r']['platforms']['flame-kk']['mozharness_config']['extra_args'] = [
+    '--target', 'flame-kk', '--config', 'b2g/releng-private-updates.py',
+    '--gaia-languages-file', 'locales/languages_all.json',
+    '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
+    '--config', GLOBAL_VARS['mozharness_configs']['balrog']
+]
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['flame-kk_eng']['enable_nightly'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-debug']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-l']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-l-debug']['enable_nightly'] = False
 
 ######## try
 # Try-specific configs