--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -38,20 +38,16 @@ BRANCHES = {
# disabled in bug 1215527
# 'maple': {}
'pine': {},
'fx-team': {},
'mozilla-b2g37_v2_2': {
'gecko_version': 37,
'b2g_version': (2, 2, 0),
},
- 'mozilla-b2g37_v2_2r': {
- 'gecko_version': 37,
- 'b2g_version': (2, 2, 0),
- },
'mozilla-b2g44_v2_5': {
'gecko_version': 44,
'b2g_version': (2, 5, 0),
},
'b2g-ota': {
'gecko_version': 45,
'b2g_version': (2, 6, 0),
},
@@ -1603,18 +1599,16 @@ BRANCHES['pine']['platforms']['emulator'
MOCHITEST + CRASHTEST + XPCSHELL + MARIONETTE + JSREFTEST + REFTEST_20
BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = \
MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL_CHUNKED
# disabled for Bug 1150320
# BRANCHES['jamun']['repo_path'] = "projects/jamun"
BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = "releases/mozilla-b2g37_v2_2"
BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux64_gecko']['enable_opt_unittests'] = True
-BRANCHES['mozilla-b2g37_v2_2r']['repo_path'] = "releases/mozilla-b2g37_v2_2r"
-BRANCHES['mozilla-b2g37_v2_2r']['platforms']['linux64_gecko']['enable_opt_unittests'] = True
BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = "releases/mozilla-b2g44_v2_5"
BRANCHES['b2g-ota']['repo_path'] = "releases/b2g-ota"
BRANCHES['mozilla-central']['branch_name'] = "Firefox"
BRANCHES['mozilla-inbound']['repo_path'] = "integration/mozilla-inbound"
BRANCHES['b2g-inbound']['branch_name'] = "B2g-Inbound"
BRANCHES['b2g-inbound']['repo_path'] = "integration/b2g-inbound"
BRANCHES['try']['pgo_strategy'] = "try"
BRANCHES['try']['enable_try'] = True
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -122,20 +122,16 @@ BRANCHES = {
'mozilla-esr38': {
'tinderbox_tree': 'Mozilla-Esr38',
'mobile_tinderbox_tree': 'Mozilla-Esr38',
},
'mozilla-b2g37_v2_2': {
'tinderbox_tree': 'Mozilla-B2g37-v2.2',
'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2',
},
- 'mozilla-b2g37_v2_2r': {
- 'tinderbox_tree': 'Mozilla-B2g37-v2.2r',
- 'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2r',
- },
'mozilla-beta': {
'tinderbox_tree': 'Mozilla-Beta',
'mobile_tinderbox_tree': 'Mozilla-Beta',
},
'mozilla-aurora': {
'tinderbox_tree': 'Mozilla-Aurora',
'mobile_tinderbox_tree': 'Mozilla-Aurora',
},
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -949,32 +949,16 @@ BRANCHES = {
'emulator-kk-debug': {},
'emulator-l': {},
'emulator-l-debug': {},
'flame-kk': {},
'flame-kk_eng': {},
'flame-kk_eng-debug': {},
}
},
- 'mozilla-b2g37_v2_2r': {
- 'gecko_version': 37,
- 'b2g_version': (2, 2, 0),
- 'lock_platforms': True,
- 'platforms': {
- 'linux64-b2g-haz': {},
- 'linux64_gecko': {},
- 'linux64_gecko-debug': {},
- 'emulator': {},
- 'emulator-debug': {},
- 'emulator-l': {},
- 'emulator-l-debug': {},
- 'flame-kk': {},
- 'flame-kk_eng': {},
- }
- },
'mozilla-b2g44_v2_5': {
'gecko_version': 44,
'b2g_version': (2, 5, 0),
'lock_platforms': True,
'platforms': {
'linux64-b2g-haz': {},
'emulator': {},
'emulator-debug': {},
@@ -1175,41 +1159,16 @@ BRANCHES['mozilla-b2g37_v2_2']['platform
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-debug']['enable_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-jb']['enable_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-jb-debug']['enable_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-kk']['enable_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-kk-debug']['enable_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-l']['enable_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-l-debug']['enable_nightly'] = False
-######## mozilla-b2g37_v2_2r
-# This is a path, relative to HGURL, where the repository is located
-# HGURL + repo_path should be a valid repository
-BRANCHES['mozilla-b2g37_v2_2r']['repo_path'] = 'releases/mozilla-b2g37_v2_2r'
-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
-
######## mozilla-b2g44_v2_5
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = 'releases/mozilla-b2g44_v2_5'
# TODO: coordinate l1n repos with bug 1218060
BRANCHES['mozilla-b2g44_v2_5']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_5'
BRANCHES['mozilla-b2g44_v2_5']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora'
BRANCHES['mozilla-b2g44_v2_5']['start_hour'] = [0]
--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -28,17 +28,16 @@ else:
ACTIVE_BRANCHES = ACTIVE_PROJECT_BRANCHES[:]
ACTIVE_BRANCHES.extend([
'mozilla-central',
'mozilla-beta',
'mozilla-aurora',
'mozilla-release',
'mozilla-esr38',
'mozilla-b2g37_v2_2',
- 'mozilla-b2g37_v2_2r',
'mozilla-b2g44_v2_5',
])
if 'limit_tb_branches' in master_config:
ACTIVE_THUNDERBIRD_BRANCHES = [x.encode("utf-8") for x in master_config['limit_tb_branches']]
else:
ACTIVE_THUNDERBIRD_BRANCHES = ACTIVE_THUNDERBIRD_PROJECT_BRANCHES[:]
ACTIVE_THUNDERBIRD_BRANCHES.extend([
'comm-central',
@@ -48,17 +47,16 @@ else:
])
if 'limit_b2g_branches' in master_config:
ACTIVE_B2G_BRANCHES = [x.encode("utf-8") for x in master_config['limit_b2g_branches']]
else:
ACTIVE_B2G_BRANCHES = ACTIVE_B2G_PROJECT_BRANCHES[:]
ACTIVE_B2G_BRANCHES.extend([
'mozilla-central',
'mozilla-b2g37_v2_2',
- 'mozilla-b2g37_v2_2r',
'mozilla-b2g44_v2_5',
'b2g-ota',
])
# MERGE DAY: Remove the following block when we are sure b2g CI is moved to
# taskcluster
# Add mozilla-aurora on odd-numbered m-c gecko versions
# b = {'mozilla-central': {}}
# master_common.setMainFirefoxVersions(b)
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2158,23 +2158,16 @@ BRANCHES = {
'win32': {},
'macosx64': {},
'linux-debug': {},
'linux64-debug': {},
'macosx64-debug': {},
'win32-debug': {},
},
},
- 'mozilla-b2g37_v2_2r': {
- 'merge_builds': False,
- 'branch_projects': [],
- 'lock_platforms': True,
- 'gecko_version': 37,
- 'platforms': {},
- },
'mozilla-b2g44_v2_5': {
'merge_builds': False,
'branch_projects': [],
'lock_platforms': True,
'gecko_version': 44,
'platforms': {},
},
'b2g-ota': {
@@ -2538,44 +2531,16 @@ BRANCHES['mozilla-b2g37_v2_2']['enUS_bin
BRANCHES['mozilla-b2g37_v2_2']['enable_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['create_partial'] = False
BRANCHES['mozilla-b2g37_v2_2']['enable_blocklist_update'] = False
BRANCHES['mozilla-b2g37_v2_2']['enable_hsts_update'] = False
BRANCHES['mozilla-b2g37_v2_2']['enable_hpkp_update'] = False
BRANCHES['mozilla-b2g37_v2_2']['enable_valgrind'] = False
BRANCHES['mozilla-b2g37_v2_2']['enabled_products'] = ['firefox']
-######## mozilla-b2g37_v2_2r
-BRANCHES['mozilla-b2g37_v2_2r']['repo_path'] = 'releases/mozilla-b2g37_v2_2r'
-BRANCHES['mozilla-b2g37_v2_2r']['update_channel'] = 'nightly-b2g37-2.2r'
-BRANCHES['mozilla-b2g37_v2_2r']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
-BRANCHES['mozilla-b2g37_v2_2r']['enable_weekly_bundle'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enable_perproduct_builds'] = True
-BRANCHES['mozilla-b2g37_v2_2r']['start_hour'] = [3]
-BRANCHES['mozilla-b2g37_v2_2r']['start_minute'] = [15]
-BRANCHES['mozilla-b2g37_v2_2r']['pgo_platforms'] = []
-BRANCHES['mozilla-b2g37_v2_2r']['enable_mac_a11y'] = True
-BRANCHES['mozilla-b2g37_v2_2r']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['mozilla-b2g37_v2_2r']['enable_l10n'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enable_l10n_onchange'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['l10n_platforms'] = ['linux', 'linux64',
- 'win32', 'macosx64']
-BRANCHES['mozilla-b2g37_v2_2r']['l10nDatedDirs'] = True
-BRANCHES['mozilla-b2g37_v2_2r']['enUS_binaryURL'] = \
- GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g37_v2_2r'
-BRANCHES['mozilla-b2g37_v2_2r']['enable_nightly'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['create_partial'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enable_blocklist_update'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enable_hsts_update'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enable_hpkp_update'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enable_valgrind'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enabled_products'] = ['firefox']
-
######## mozilla-b2g44_v2_5
BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = 'releases/mozilla-b2g44_v2_5'
BRANCHES['mozilla-b2g44_v2_5']['update_channel'] = 'nightly-b2g44-2.5'
BRANCHES['mozilla-b2g44_v2_5']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
BRANCHES['mozilla-b2g44_v2_5']['enable_weekly_bundle'] = False
BRANCHES['mozilla-b2g44_v2_5']['enable_perproduct_builds'] = True
BRANCHES['mozilla-b2g44_v2_5']['start_hour'] = [3]
BRANCHES['mozilla-b2g44_v2_5']['start_minute'] = [45]
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -92,20 +92,16 @@ BRANCHES = {
'mozilla-esr38': {
'tinderbox_tree': 'Mozilla-Esr38',
'mobile_tinderbox_tree': 'Mozilla-Esr38',
},
'mozilla-b2g37_v2_2': {
'tinderbox_tree': 'Mozilla-B2g37-v2.2',
'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2',
},
- 'mozilla-b2g37_v2_2r': {
- 'tinderbox_tree': 'Mozilla-B2g37-v2.2r',
- 'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2r',
- },
'mozilla-b2g44_v2_5': {
'tinderbox_tree': 'Mozilla-B2g44-v2.5',
'mobile_tinderbox_tree': 'Mozilla-B2g44-v2.5',
},
'b2g-ota': {
'tinderbox_tree': 'B2g-Ota',
'mobile_tinderbox_tree': 'B2g-Ota',
},
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -100,22 +100,16 @@ BRANCHES = {
'file_update_on_closed_tree': False,
},
'mozilla-b2g37_v2_2': {
'enable_blocklist_update': False,
'enable_hsts_update': False,
'enable_hpkp_update': False,
'file_update_on_closed_tree': False,
},
- 'mozilla-b2g37_v2_2r': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
'try': {
'download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox',
'mobile_download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/mobile',
'enable_mail_notifier': False, # Set to True when testing
'email_override': [], # Set to your address when testing
'package_url': 'http://ftp.stage.mozaws.net/pub/firefox/try-builds',
'talos_masters': [],
'platforms': {