--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -30,20 +30,16 @@ BRANCHES = {
'cedar': {},
# Disabled for bug 1151699
# 'cypress': {},
# Disabled for Bug 1150320
# 'jamun': {},
'maple': {},
'pine': {},
'fx-team': {},
- 'mozilla-b2g32_v2_0': {
- 'gecko_version': 32,
- 'b2g_version': (2, 0, 0),
- },
'mozilla-b2g34_v2_1': {
'gecko_version': 34,
'b2g_version': (2, 1, 0),
},
'mozilla-b2g34_v2_1s': {
'gecko_version': 34,
'b2g_version': (2, 1, 0),
},
@@ -2241,17 +2237,16 @@ BRANCHES['pine']['branch_name'] = "Pine"
BRANCHES['pine']['repo_path'] = "projects/pine"
BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] = \
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-b2g32_v2_0']['repo_path'] = "releases/mozilla-b2g32_v2_0"
BRANCHES['mozilla-b2g34_v2_1']['repo_path'] = "releases/mozilla-b2g34_v2_1"
BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = "releases/mozilla-b2g34_v2_1s"
BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = "releases/mozilla-b2g37_v2_2"
BRANCHES['mozilla-b2g37_v2_2r']['repo_path'] = "releases/mozilla-b2g37_v2_2r"
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"
@@ -2306,27 +2301,16 @@ for name, branch in items_before(BRANCHE
BRANCHES[name]['platforms'][slave_platform[0]][slave_platform[1]]['opt_unittest_suites'] += GAIA_INTEGRATION[:]
# explicitly set slave platforms per branch
for branch in BRANCHES.keys():
for platform in BRANCHES[branch]['platforms']:
if 'slave_platforms' not in BRANCHES[branch]['platforms'][platform]:
BRANCHES[branch]['platforms'][platform]['slave_platforms'] = list(PLATFORMS[platform]['slave_platforms'])
-# Disable emulator cppunit tests on older branches
-OLD_BRANCHES = set([name for name, branch in items_before(BRANCHES, 'gecko_version', 34)])
-for b in BRANCHES.keys():
- branch = BRANCHES[b]
- if b in OLD_BRANCHES:
- if nested_haskey(branch['platforms'], 'emulator', 'ubuntu64_vm-b2g-emulator'):
- slave_p = branch['platforms']['emulator']['ubuntu64_vm-b2g-emulator']
- for suites in ['opt_unittest_suites', 'debug_unittest_suites']:
- slave_p[suites] = [x for x in slave_p[suites]
- if not x[0].startswith('cppunit')]
-
# Disable tests jobs of builds that have been moved to TC
for _, branch in items_at_least(BRANCHES, 'gecko_version', 39):
for p in ('emulator-jb', 'emulator-kk', 'linux64_gecko'):
if branch['platforms'].get(p):
del branch['platforms'][p]
PROJECTS = {}--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -50,24 +50,16 @@ BRANCHES = {
'macosx64': {},
'win32': {},
'win64': {},
'linux': {},
'linux64': {},
},
'lock_platforms': True,
},
- 'mozilla-b2g32_v2_0': {
- 'datazilla_url': None,
- 'gecko_version': 32,
- 'platforms': {
- 'linux': {},
- },
- 'lock_platforms': True,
- },
'mozilla-b2g34_v2_1': {
'datazilla_url': None,
'gecko_version': 34,
'platforms': {
'linux': {},
},
'lock_platforms': True,
},
@@ -2070,21 +2062,16 @@ BRANCHES['mozilla-esr31']['platforms']['
######### mozilla-esr38
BRANCHES['mozilla-esr38']['repo_path'] = "releases/mozilla-esr38"
BRANCHES['mozilla-esr38']['pgo_strategy'] = 'per-checkin'
BRANCHES['mozilla-esr38']['platforms']['win32']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr38']['platforms']['macosx64']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr38']['platforms']['linux']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr38']['platforms']['linux64']['talos_slave_platforms'] = []
-######### mozilla-b2g32_v2_0
-BRANCHES['mozilla-b2g32_v2_0']['repo_path'] = "releases/mozilla-b2g32_v2_0"
-BRANCHES['mozilla-b2g32_v2_0']['pgo_strategy'] = None
-BRANCHES['mozilla-b2g32_v2_0']['platforms']['linux']['talos_slave_platforms'] = []
-
######### mozilla-b2g34_v2_1
BRANCHES['mozilla-b2g34_v2_1']['repo_path'] = "releases/mozilla-b2g34_v2_1"
BRANCHES['mozilla-b2g34_v2_1']['pgo_strategy'] = None
BRANCHES['mozilla-b2g34_v2_1']['platforms']['linux']['talos_slave_platforms'] = []
######### mozilla-b2g37_v2_2
BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = "releases/mozilla-b2g37_v2_2"
BRANCHES['mozilla-b2g37_v2_2']['pgo_strategy'] = None--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -112,32 +112,32 @@ BRANCHES = {
'mozilla-esr31': {
'tinderbox_tree': 'Mozilla-Esr31',
'mobile_tinderbox_tree': 'Mozilla-Esr31',
},
'mozilla-esr38': {
'tinderbox_tree': 'Mozilla-Esr38',
'mobile_tinderbox_tree': 'Mozilla-Esr38',
},
- 'mozilla-b2g32_v2_0': {
- 'tinderbox_tree': 'Mozilla-B2g32-v2.0',
- 'mobile_tinderbox_tree': 'Mozilla-B2g32-v2.0',
- },
'mozilla-b2g34_v2_1': {
'tinderbox_tree': 'Mozilla-B2g34-v2.1',
'mobile_tinderbox_tree': 'Mozilla-B2g34-v2.1',
},
'mozilla-b2g34_v2_1s': {
'tinderbox_tree': 'Mozilla-B2g34-v2.1s',
'mobile_tinderbox_tree': 'Mozilla-B2g34-v2.1s',
},
'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
@@ -1198,20 +1198,16 @@ for platform in PLATFORM_VARS.values():
platform['env'].update((k, v) for k, v in GLOBAL_ENV.items() if k not in platform['env'])
# All branches (not in project_branches) that are to be built MUST be listed here, along with their
# platforms (if different from the default set).
BRANCHES = {
'mozilla-central': {
},
- 'mozilla-b2g32_v2_0': {
- 'gecko_version': 32,
- 'b2g_version': (2, 0, 0),
- },
'mozilla-b2g34_v2_1': {
'gecko_version': 34,
'b2g_version': (2, 1, 0),
},
'mozilla-b2g34_v2_1s': {
'gecko_version': 34,
'b2g_version': (2, 1, 0),
},
@@ -1464,37 +1460,16 @@ BRANCHES['mozilla-b2g34_v2_1s']['platfor
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['flame-kk_eng']['enable_periodic'] = False
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['flame-kk_eng']['enable_dep'] = False
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['flame-kk_eng-debug']['enable_periodic'] = False
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-4']['enable_periodic'] = False
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-4_eng']['enable_periodic'] = False
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-5-l']['enable_periodic'] = False
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-5-l_eng']['enable_periodic'] = False
-######## mozilla-b2g32_v2_0
-# This is a path, relative to HGURL, where the repository is located
-# HGURL + repo_path should be a valid repository
-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']['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
-BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-kk-debug']['enable_nightly'] = True
-BRANCHES['mozilla-b2g32_v2_0']['platforms']['nexus-5-l']['enable_periodic'] = False
-BRANCHES['mozilla-b2g32_v2_0']['platforms']['nexus-5-l_eng']['enable_periodic'] = False
-
######## try
# Try-specific configs
# This is a path, relative to HGURL, where the repository is located
# HGURL repo_path should be a valid repository
BRANCHES['try']['repo_path'] = 'try'
BRANCHES['try']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
BRANCHES['try']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
BRANCHES['try']['enable_merging'] = False
@@ -1597,22 +1572,16 @@ for branch in BRANCHES:
if 'dolphin-512_eng' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['dolphin-512_eng']
# exact rooting was enabled in gecko 32
for name, branch in items_before(BRANCHES, 'gecko_version', 32):
if 'linux64-b2g-haz' in branch['platforms']:
del branch['platforms']['linux64-b2g-haz']
-# b2g 2.0+
-for name, branch in items_before(BRANCHES, 'gecko_version', 32):
- for p in ('flame-kk', 'flame-kk_eng', 'flame-kk_eng-debug'):
- if p in branch['platforms']:
- del branch['platforms'][p]
-
# b2g 2.2+
for name, branch in items_before(BRANCHES, 'gecko_version', 37):
for p in ('emulator-l', 'emulator-l-debug'):
if p in branch['platforms']:
del branch['platforms'][p]
# Disable emulators for gecko 39 and higher, they're now in TC
# See bug 1143766--- 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-esr31',
'mozilla-esr38',
- 'mozilla-b2g32_v2_0',
'mozilla-b2g34_v2_1',
'mozilla-b2g34_v2_1s',
'mozilla-b2g37_v2_2',
'mozilla-b2g37_v2_2r',
])
if 'limit_tb_branches' in master_config:
ACTIVE_THUNDERBIRD_BRANCHES = [x.encode("utf-8") for x in master_config['limit_tb_branches']]
else:
@@ -51,17 +50,16 @@ else:
'comm-esr38',
])
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-b2g32_v2_0',
'mozilla-b2g34_v2_1',
'mozilla-b2g34_v2_1s',
'mozilla-b2g37_v2_2',
'mozilla-b2g37_v2_2r',
])
# 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--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2320,43 +2320,32 @@ BRANCHES = {
'win64': {},
'linux-debug': {},
'linux64-debug': {},
'macosx64-debug': {},
'win32-debug': {},
'win64-debug': {},
},
},
- 'mozilla-b2g32_v2_0': {
- 'merge_builds': False,
- 'branch_projects': [],
- 'lock_platforms': True,
- 'gecko_version': 32,
- 'platforms': {
- 'linux': {},
- 'linux-debug': {},
- },
- },
'mozilla-b2g34_v2_1': {
'merge_builds': False,
'branch_projects': [],
'lock_platforms': True,
'gecko_version': 34,
'platforms': {
'linux': {},
'linux-debug': {},
},
},
'mozilla-b2g34_v2_1s': {
'merge_builds': False,
'branch_projects': [],
'lock_platforms': True,
'gecko_version': 34,
- 'platforms': {
- },
+ 'platforms': {},
},
'mozilla-b2g37_v2_2': {
'merge_builds': False,
'branch_projects': [],
'lock_platforms': True,
'gecko_version': 37,
'platforms': {
'linux': {},
@@ -2739,45 +2728,16 @@ BRANCHES['mozilla-esr38']['enable_nightl
BRANCHES['mozilla-esr38']['updates_enabled'] = False
BRANCHES['mozilla-esr38']['create_partial'] = False
BRANCHES['mozilla-esr38']['enable_blocklist_update'] = True
BRANCHES['mozilla-esr38']['enable_hsts_update'] = True
BRANCHES['mozilla-esr38']['enable_hpkp_update'] = True
BRANCHES['mozilla-esr38']['enable_valgrind'] = False
BRANCHES['mozilla-esr38']['enabled_products'] = ['firefox']
-######## mozilla-b2g32_v2_0
-BRANCHES['mozilla-b2g32_v2_0']['repo_path'] = 'releases/mozilla-b2g32_v2_0'
-BRANCHES['mozilla-b2g32_v2_0']['update_channel'] = 'nightly-b2g32'
-BRANCHES['mozilla-b2g32_v2_0']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
-BRANCHES['mozilla-b2g32_v2_0']['enable_weekly_bundle'] = True
-BRANCHES['mozilla-b2g32_v2_0']['enable_perproduct_builds'] = True
-BRANCHES['mozilla-b2g32_v2_0']['start_hour'] = [3]
-BRANCHES['mozilla-b2g32_v2_0']['start_minute'] = [45]
-BRANCHES['mozilla-b2g32_v2_0']['enable_xulrunner'] = False
-BRANCHES['mozilla-b2g32_v2_0']['pgo_platforms'] = []
-BRANCHES['mozilla-b2g32_v2_0']['enable_mac_a11y'] = True
-BRANCHES['mozilla-b2g32_v2_0']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['mozilla-b2g32_v2_0']['enable_l10n'] = False
-BRANCHES['mozilla-b2g32_v2_0']['enable_l10n_onchange'] = False
-BRANCHES['mozilla-b2g32_v2_0']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-b2g32_v2_0']['l10n_platforms'] = ['linux', 'linux64', 'win32',
- 'macosx64']
-BRANCHES['mozilla-b2g32_v2_0']['l10nDatedDirs'] = True
-BRANCHES['mozilla-b2g32_v2_0']['enUS_binaryURL'] = \
- GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g32_v2_0'
-BRANCHES['mozilla-b2g32_v2_0']['enable_nightly'] = False
-BRANCHES['mozilla-b2g32_v2_0']['create_partial'] = False
-BRANCHES['mozilla-b2g32_v2_0']['enable_blocklist_update'] = False
-BRANCHES['mozilla-b2g32_v2_0']['enable_hsts_update'] = True
-BRANCHES['mozilla-b2g32_v2_0']['enable_hpkp_update'] = True
-BRANCHES['mozilla-b2g32_v2_0']['enable_valgrind'] = False
-BRANCHES['mozilla-b2g32_v2_0']['enabled_products'] = ['firefox']
-
######## mozilla-b2g34_v2_1
BRANCHES['mozilla-b2g34_v2_1']['repo_path'] = 'releases/mozilla-b2g34_v2_1'
BRANCHES['mozilla-b2g34_v2_1']['update_channel'] = 'nightly-b2g34'
BRANCHES['mozilla-b2g34_v2_1']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g34_v2_1']['enable_weekly_bundle'] = True
BRANCHES['mozilla-b2g34_v2_1']['enable_perproduct_builds'] = True
BRANCHES['mozilla-b2g34_v2_1']['start_hour'] = [3]
BRANCHES['mozilla-b2g34_v2_1']['start_minute'] = [45]--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -88,21 +88,16 @@ BRANCHES = {
'tinderbox_tree': 'Mozilla-Esr31',
'mobile_tinderbox_tree': 'Mozilla-Esr31',
},
'mozilla-esr38': {
'packaged_unittest_tinderbox_tree': 'Mozilla-Esr38',
'tinderbox_tree': 'Mozilla-Esr38',
'mobile_tinderbox_tree': 'Mozilla-Esr38',
},
- 'mozilla-b2g32_v2_0': {
- 'packaged_unittest_tinderbox_tree': 'Mozilla-B2g32-v2.0',
- 'tinderbox_tree': 'Mozilla-B2g32-v2.0',
- 'mobile_tinderbox_tree': 'Mozilla-B2g32-v2.0',
- },
'mozilla-b2g34_v2_1': {
'packaged_unittest_tinderbox_tree': 'Mozilla-B2g34-v2.1',
'tinderbox_tree': 'Mozilla-B2g34-v2.1',
'mobile_tinderbox_tree': 'Mozilla-B2g34-v2.1',
},
'mozilla-b2g34_v2_1s': {
'packaged_unittest_tinderbox_tree': 'Mozilla-B2g34-v2.1s',
'tinderbox_tree': 'Mozilla-B2g34-v2.1s',--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -90,35 +90,35 @@ BRANCHES = {
'file_update_on_closed_tree': False,
},
'mozilla-esr38': {
'enable_blocklist_update': False,
'enable_hsts_update': False,
'enable_hpkp_update': False,
'file_update_on_closed_tree': False,
},
- 'mozilla-b2g32_v2_0': {
+ 'mozilla-b2g34_v2_1': {
'enable_blocklist_update': False,
'enable_hsts_update': False,
'enable_hpkp_update': False,
'file_update_on_closed_tree': False,
},
- 'mozilla-b2g34_v2_1': {
+ 'mozilla-b2g34_v2_1s': {
'enable_blocklist_update': False,
'enable_hsts_update': False,
'enable_hpkp_update': False,
'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-b2g34_v2_1s': {
+ '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',