--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -54,16 +54,20 @@ BRANCHES = {
'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-b2g37_v2_2': {
+ 'gecko_version': 37,
+ 'b2g_version': (2, 2, 0),
+ },
'mozilla-central': {},
'mozilla-inbound': {},
'b2g-inbound': {},
#'services-central': {}, # Bug 1010674
'try': {},
'gaia-try': {
'lock_platforms': True,
'platforms': {
@@ -2204,16 +2208,17 @@ BRANCHES['pine']['platforms']['emulator'
MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL_CHUNKED
BRANCHES['cypress']['branch_name'] = "Cypress"
BRANCHES['cypress']['repo_path'] = "projects/cypress"
BRANCHES['jamun']['repo_path'] = "projects/jamun"
BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
BRANCHES['mozilla-b2g30_v1_4']['repo_path'] = "releases/mozilla-b2g30_v1_4"
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-b2g37_v2_2']['repo_path'] = "releases/mozilla-b2g37_v2_2"
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
BRANCHES['try']['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/testing/mozharness/mozharness.json"--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -71,16 +71,28 @@ BRANCHES = {
# desktop per sicking in Bug 829513
'macosx64': {},
'win32': {},
'linux': {},
'linux64': {},
},
'lock_platforms': True,
},
+ 'mozilla-b2g37_v2_2': {
+ 'datazilla_url': None,
+ 'gecko_version': 37,
+ 'platforms': {
+ # desktop per sicking in Bug 829513
+ 'macosx64': {},
+ 'win32': {},
+ 'linux': {},
+ 'linux64': {},
+ },
+ 'lock_platforms': True,
+ },
'try': {
'coallesce_jobs': False,
},
}
setMainFirefoxVersions(BRANCHES)
# Talos
@@ -1753,16 +1765,25 @@ BRANCHES['mozilla-b2g32_v2_0']['platform
######### 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']['win32']['talos_slave_platforms'] = []
BRANCHES['mozilla-b2g34_v2_1']['platforms']['macosx64']['talos_slave_platforms'] = []
BRANCHES['mozilla-b2g34_v2_1']['platforms']['linux']['talos_slave_platforms'] = []
BRANCHES['mozilla-b2g34_v2_1']['platforms']['linux64']['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
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['win32']['talos_slave_platforms'] = []
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['macosx64']['talos_slave_platforms'] = []
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux']['talos_slave_platforms'] = []
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux64']['talos_slave_platforms'] = []
+
+
######## try
BRANCHES['try']['repo_path'] = "try"
BRANCHES['try']['xperf_tests'] = (1, False, TALOS_TP_NEW_OPTS, WIN7_ONLY)
BRANCHES['try']['tp5o_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)
BRANCHES['try']['other_tests'] = (0, False, {}, ALL_TALOS_PLATFORMS)
BRANCHES['try']['other_nol64_tests'] = (1, False, {}, NO_LINUX64)
BRANCHES['try']['other_l64_tests'] = (1, False, {}, LINUX64_ONLY)
BRANCHES['try']['g1_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -128,16 +128,20 @@ BRANCHES = {
'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-b2g37_v2_2': {
+ 'tinderbox_tree': 'Mozilla-B2g37-v2.2',
+ 'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2',
+ },
'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
@@ -1582,16 +1582,20 @@ BRANCHES = {
'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-b2g37_v2_2': {
+ 'gecko_version': 37,
+ 'b2g_version': (2, 2, 0),
+ },
'try': {
'lock_platforms': True,
'platforms': {
'linux32_gecko': {},
'linux32_gecko-debug': {},
'linux64_gecko': {},
'linux64_gecko-debug': {},
'linux64-mulet': {},
@@ -1715,16 +1719,47 @@ BRANCHES['mozilla-central']['platforms']
BRANCHES['mozilla-central']['platforms']['emulator-jb']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['emulator-jb-debug']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['linux64-b2g-haz']['enable_nightly'] = False
BRANCHES['mozilla-central']['platforms']['emulator-kk']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['emulator-kk-debug']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['dolphin']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['dolphin_eng']['enable_nightly'] = True
+######## mozilla-b2g37_v2_2
+# This is a path, relative to HGURL, where the repository is located
+# HGURL + repo_path should be a valid repository
+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']['helix']['enable_nightly'] = True
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['wasabi']['enable_nightly'] = True
+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
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-jb-debug']['enable_nightly'] = True
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux64-b2g-haz']['enable_nightly'] = False
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-kk']['enable_nightly'] = True
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-kk-debug']['enable_nightly'] = True
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['dolphin']['enable_nightly'] = True
+BRANCHES['mozilla-b2g37_v2_2']['platforms']['dolphin_eng']['enable_nightly'] = True
+
######## mozilla-b2g34_v2_1
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
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]--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -30,16 +30,17 @@ else:
'mozilla-central',
'mozilla-beta',
'mozilla-aurora',
'mozilla-release',
'mozilla-esr31',
'mozilla-b2g30_v1_4',
'mozilla-b2g32_v2_0',
'mozilla-b2g34_v2_1',
+ 'mozilla-b2g37_v2_2',
])
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',
'comm-beta',
@@ -50,16 +51,17 @@ 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-b2g30_v1_4',
'mozilla-b2g32_v2_0',
'mozilla-b2g34_v2_1',
+ 'mozilla-b2g37_v2_2',
])
# 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)
# Starting with v2.2, b2g automation will be handled by taskcluster
# if b['mozilla-central']['gecko_version'] % 2:--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2228,16 +2228,32 @@ BRANCHES = {
'win32': {},
'macosx64': {},
'linux-debug': {},
'linux64-debug': {},
'macosx64-debug': {},
'win32-debug': {},
},
},
+ 'mozilla-b2g37_v2_2': {
+ 'merge_builds': False,
+ 'branch_projects': [],
+ 'lock_platforms': True,
+ 'gecko_version': 37,
+ 'platforms': {
+ 'linux': {},
+ 'linux64': {},
+ 'win32': {},
+ 'macosx64': {},
+ 'linux-debug': {},
+ 'linux64-debug': {},
+ 'macosx64-debug': {},
+ 'win32-debug': {},
+ },
+ },
'try': {
'branch_projects': ['spidermonkey_try'],
# The following platforms are not part of the default set,
# so only run on Try.
'extra_platforms': {
'linux64-sh-haz': {},
'linux64-cc': {},
'macosx64-st-an-debug': {},
@@ -2668,16 +2684,49 @@ BRANCHES['mozilla-b2g34_v2_1']['create_p
BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g34_v2_1'
BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g34_v2_1'
BRANCHES['mozilla-b2g34_v2_1']['enable_blocklist_update'] = False
BRANCHES['mozilla-b2g34_v2_1']['enable_hsts_update'] = True
BRANCHES['mozilla-b2g34_v2_1']['enable_hpkp_update'] = True
BRANCHES['mozilla-b2g34_v2_1']['enable_valgrind'] = False
BRANCHES['mozilla-b2g34_v2_1']['enabled_products'] = ['firefox', 'mobile']
+######## mozilla-b2g37_v2_2
+BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = 'releases/mozilla-b2g37_v2_2'
+BRANCHES['mozilla-b2g37_v2_2']['update_channel'] = 'nightly-b2g37'
+BRANCHES['mozilla-b2g37_v2_2']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
+BRANCHES['mozilla-b2g37_v2_2']['enable_weekly_bundle'] = True
+BRANCHES['mozilla-b2g37_v2_2']['enable_perproduct_builds'] = True
+BRANCHES['mozilla-b2g37_v2_2']['start_hour'] = [3]
+BRANCHES['mozilla-b2g37_v2_2']['start_minute'] = [15]
+BRANCHES['mozilla-b2g37_v2_2']['enable_xulrunner'] = False
+BRANCHES['mozilla-b2g37_v2_2']['pgo_platforms'] = []
+BRANCHES['mozilla-b2g37_v2_2']['enable_mac_a11y'] = True
+BRANCHES['mozilla-b2g37_v2_2']['unittest_build_space'] = 6
+# L10n configuration
+BRANCHES['mozilla-b2g37_v2_2']['enable_l10n'] = False
+BRANCHES['mozilla-b2g37_v2_2']['enable_l10n_onchange'] = False
+BRANCHES['mozilla-b2g37_v2_2']['l10nNightlyUpdate'] = False
+BRANCHES['mozilla-b2g37_v2_2']['l10n_platforms'] = ['linux', 'linux64',
+ 'win32', 'macosx64']
+BRANCHES['mozilla-b2g37_v2_2']['l10nDatedDirs'] = True
+BRANCHES['mozilla-b2g37_v2_2']['enUS_binaryURL'] = \
+ GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g37_v2_2'
+BRANCHES['mozilla-b2g37_v2_2']['enable_nightly'] = False
+BRANCHES['mozilla-b2g37_v2_2']['create_snippet'] = False
+BRANCHES['mozilla-b2g37_v2_2']['create_partial'] = False
+BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g37_v2_2'
+BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g37_v2_2'
+BRANCHES['mozilla-b2g37_v2_2']['enable_blocklist_update'] = False
+BRANCHES['mozilla-b2g37_v2_2']['enable_hsts_update'] = True
+BRANCHES['mozilla-b2g37_v2_2']['enable_hpkp_update'] = True
+BRANCHES['mozilla-b2g37_v2_2']['enable_valgrind'] = False
+BRANCHES['mozilla-b2g37_v2_2']['enabled_products'] = ['firefox', 'mobile']
+
+
######## try
# Try-specific configs
BRANCHES['try']['stage_username'] = 'trybld'
BRANCHES['try']['stage_username_mobile'] = 'trybld'
BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
BRANCHES['try']['stage_ssh_mobile_key'] = 'trybld_dsa'
BRANCHES['try']['stage_base_path'] = '/home/ftp/pub/firefox/try-builds'
BRANCHES['try']['stage_base_path_mobile'] = '/home/ftp/pub/firefox/try-builds'--- a/mozilla/gecko_versions.json
+++ b/mozilla/gecko_versions.json
@@ -1,8 +1,8 @@
{
"mozilla-release": 35,
- "mozilla-beta": 35,
- "mozilla-aurora": 36,
- "mozilla-central": 37,
- "comm-beta": 35,
- "comm-aurora": 36
+ "mozilla-beta": 36,
+ "mozilla-aurora": 37,
+ "mozilla-central": 38,
+ "comm-beta": 36,
+ "comm-aurora": 37
}--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -123,16 +123,21 @@ BRANCHES = {
'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-b2g37_v2_2': {
+ 'packaged_unittest_tinderbox_tree': 'Mozilla-B2g37-v2.2',
+ 'tinderbox_tree': 'Mozilla-B2g37-v2.2',
+ 'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2',
+ },
'mozilla-beta': {
'packaged_unittest_tinderbox_tree': 'Mozilla-Beta',
'tinderbox_tree': 'Mozilla-Beta',
'mobile_tinderbox_tree': 'Mozilla-Beta',
},
'mozilla-aurora': {
'packaged_unittest_tinderbox_tree': 'Mozilla-Aurora',
'tinderbox_tree': 'Mozilla-Aurora',--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -105,16 +105,22 @@ BRANCHES = {
'file_update_on_closed_tree': False,
},
'mozilla-b2g34_v2_1': {
'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,
+ },
'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://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/try-builds',
'talos_masters': [],
'platforms': {