--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -32,18 +32,16 @@ GLOBAL_VARS.update({
'macosx64-mulet': {},
'win32_gecko': {},
'win32_gecko-debug': {},
'win32-mulet': {},
'linux32_gecko_localizer': {},
'linux64_gecko_localizer': {},
'macosx64_gecko_localizer': {},
'win32_gecko_localizer': {},
- 'hamachi': {},
- 'hamachi_eng': {},
'nexus-4': {},
'nexus-4_eng': {},
'emulator': {},
'emulator-debug': {},
'emulator-jb': {},
'emulator-jb-debug': {},
'linux64-b2g-haz': {},
'emulator-kk': {},
@@ -1102,61 +1100,16 @@ PLATFORM_VARS = {
'--build',
'--summary',
'--gecko-languages-file', 'build/b2g/locales/all-locales',
],
'gecko_languages_file': 'build/b2g/locales/all-locales',
'tooltool_manifest_src': 'b2g/config/tooltool-manifests/win32/releng.manifest',
'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
},
- 'hamachi': {
- 'mozharness_config': {
- 'script_name': 'scripts/b2g_build.py',
- # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
- # --target name below
- 'extra_args': ['--target', 'hamachi', '--config', 'b2g/releng-fota-updates.py',
- '--gaia-languages-file', 'locales/languages_dev.json',
- '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
- '--config', GLOBAL_VARS['mozharness_configs']['balrog']],
- 'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
- 'mozharness_repo_cache': '/tools/checkouts/mozharness',
- 'tools_repo_cache': '/tools/checkouts/build-tools',
- },
- 'env': {
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- },
- 'stage_product': 'b2g',
- 'product_name': 'b2g',
- 'base_name': builder_prefix + '_%(branch)s_%(platform)s',
- 'slaves': SLAVES['mock'],
- 'enable_periodic': True,
- 'enable_dep': False,
- },
- 'hamachi_eng': {
- 'mozharness_config': {
- 'script_name': 'scripts/b2g_build.py',
- # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
- # --target name below
- 'extra_args': ['--target', 'hamachi', '--config', 'b2g/releng-fota-eng.py',
- '--gaia-languages-file', 'locales/languages_dev.json',
- '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
- 'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
- 'mozharness_repo_cache': '/tools/checkouts/mozharness',
- 'tools_repo_cache': '/tools/checkouts/build-tools',
- },
- 'env': {
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- },
- 'stage_product': 'b2g',
- 'product_name': 'b2g',
- 'base_name': builder_prefix + '_%(branch)s_%(platform)s',
- 'slaves': SLAVES['mock'],
- 'enable_periodic': False,
- 'enable_dep': True,
- },
'nexus-4': {
'mozharness_config': {
'script_name': 'scripts/b2g_build.py',
# b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
# --target name below
'extra_args': ['--target', 'nexus-4', '--config', 'b2g/releng-private-updates.py',
'--gaia-languages-file', 'locales/languages_dev.json',
'--gecko-languages-file', 'gecko/b2g/locales/all-locales',
@@ -1694,19 +1647,16 @@ BRANCHES['mozilla-central']['repo_path']
BRANCHES['mozilla-central']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
BRANCHES['mozilla-central']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
BRANCHES['mozilla-central']['start_hour'] = [1, 16]
BRANCHES['mozilla-central']['start_minute'] = [2]
BRANCHES['mozilla-central']['periodic_start_hours'] = range(1, 24, 3)
BRANCHES['mozilla-central']['periodic_start_minute'] = 30
BRANCHES['mozilla-central']['aus2_base_upload_dir'] = 'fake'
BRANCHES['mozilla-central']['aus2_base_upload_dir_l10n'] = 'fake'
-BRANCHES['mozilla-central']['platforms']['hamachi']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['hamachi_eng']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['hamachi_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-central']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['nexus-4_eng']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['nexus-4_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-central']['platforms']['flame-kk']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['flame-kk_eng']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['emulator']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['emulator-debug']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['emulator-jb']['enable_nightly'] = True
@@ -1723,19 +1673,16 @@ BRANCHES['mozilla-central']['platforms']
BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = 'releases/mozilla-b2g37_v2_2'
BRANCHES['mozilla-b2g37_v2_2']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
BRANCHES['mozilla-b2g37_v2_2']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora'
BRANCHES['mozilla-b2g37_v2_2']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g37_v2_2']['start_minute'] = [25]
BRANCHES['mozilla-b2g37_v2_2']['periodic_start_minute'] = 30
BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir'] = 'fake'
BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir_l10n'] = 'fake'
-BRANCHES['mozilla-b2g37_v2_2']['platforms']['hamachi']['enable_nightly'] = True
-BRANCHES['mozilla-b2g37_v2_2']['platforms']['hamachi_eng']['enable_nightly'] = True
-BRANCHES['mozilla-b2g37_v2_2']['platforms']['hamachi_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-4_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-4_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['flame-kk']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['flame-kk_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-jb']['enable_nightly'] = True
@@ -1752,19 +1699,16 @@ BRANCHES['mozilla-b2g37_v2_2']['platform
BRANCHES['mozilla-b2g34_v2_1']['repo_path'] = 'releases/mozilla-b2g34_v2_1'
BRANCHES['mozilla-b2g34_v2_1']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_1/'
BRANCHES['mozilla-b2g34_v2_1']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g34_v2_1']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g34_v2_1']['start_minute'] = [12]
BRANCHES['mozilla-b2g34_v2_1']['periodic_start_minute'] = 30
BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir'] = 'fake'
BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir_l10n'] = 'fake'
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['hamachi']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['hamachi_eng']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['hamachi_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-4_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-4_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g34_v2_1']['platforms']['flame']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['flame_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['flame-kk']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['flame-kk_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['emulator']['enable_nightly'] = True
@@ -1802,19 +1746,16 @@ BRANCHES['mozilla-b2g34_v2_1s']['platfor
BRANCHES['mozilla-b2g32_v2_0']['repo_path'] = 'releases/mozilla-b2g32_v2_0'
BRANCHES['mozilla-b2g32_v2_0']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_0/'
BRANCHES['mozilla-b2g32_v2_0']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g32_v2_0']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g32_v2_0']['start_minute'] = [2]
BRANCHES['mozilla-b2g32_v2_0']['periodic_start_minute'] = 30
BRANCHES['mozilla-b2g32_v2_0']['aus2_base_upload_dir'] = 'fake'
BRANCHES['mozilla-b2g32_v2_0']['aus2_base_upload_dir_l10n'] = 'fake'
-BRANCHES['mozilla-b2g32_v2_0']['platforms']['hamachi']['enable_nightly'] = True
-BRANCHES['mozilla-b2g32_v2_0']['platforms']['hamachi_eng']['enable_nightly'] = True
-BRANCHES['mozilla-b2g32_v2_0']['platforms']['hamachi_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g32_v2_0']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['flame-kk']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['flame-kk_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-jb']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-jb-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-kk']['enable_nightly'] = True
@@ -1826,19 +1767,16 @@ BRANCHES['mozilla-b2g32_v2_0']['platform
BRANCHES['mozilla-b2g30_v1_4']['repo_path'] = 'releases/mozilla-b2g30_v1_4'
BRANCHES['mozilla-b2g30_v1_4']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v1_4/'
BRANCHES['mozilla-b2g30_v1_4']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g30_v1_4']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g30_v1_4']['start_minute'] = [2]
BRANCHES['mozilla-b2g30_v1_4']['periodic_start_minute'] = 30
BRANCHES['mozilla-b2g30_v1_4']['aus2_base_upload_dir'] = 'fake'
BRANCHES['mozilla-b2g30_v1_4']['aus2_base_upload_dir_l10n'] = 'fake'
-BRANCHES['mozilla-b2g30_v1_4']['platforms']['hamachi']['enable_nightly'] = True
-BRANCHES['mozilla-b2g30_v1_4']['platforms']['hamachi_eng']['enable_nightly'] = True
-BRANCHES['mozilla-b2g30_v1_4']['platforms']['hamachi_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g30_v1_4']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['flame']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['flame_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-jb']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-jb-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-kk']['enable_nightly'] = True