buildbot-configs: changeset 12700:b2b9f113f2b94100018e2d7db25771015033103d

--- 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-b2g34_v2_1': {
-        'gecko_version': 34,
-        'b2g_version': (2, 1, 0),
-    },
     'mozilla-b2g34_v2_1s': {
         'gecko_version': 34,
         'b2g_version': (2, 1, 0),
     },
     'mozilla-b2g37_v2_2': {
         'gecko_version': 37,
         'b2g_version': (2, 2, 0),
     },
@@ -2237,17 +2233,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-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"
 BRANCHES['try']['pgo_strategy'] = "try"

--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -50,24 +50,16 @@ BRANCHES = {
             'macosx64': {},
             'win32': {},
             'win64': {},
             'linux': {},
             'linux64': {},
         },
         'lock_platforms': True,
     },
-    'mozilla-b2g34_v2_1': {
-        'datazilla_url': None,
-        'gecko_version': 34,
-        'platforms': {
-            'linux': {},
-        },
-        'lock_platforms': True,
-    },
     'mozilla-b2g37_v2_2': {
         'datazilla_url': None,
         'gecko_version': 37,
         'platforms': {
             # desktop per sicking in Bug 829513
             'macosx64': {},
             'win32': {},
             'linux': {},
@@ -2066,21 +2058,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-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
 BRANCHES['mozilla-b2g37_v2_2']['platforms']['win32']['talos_slave_platforms'] = []
 BRANCHES['mozilla-b2g37_v2_2']['platforms']['macosx64']['slave_platforms'] = ['snowleopard']
 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'] = []

--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -112,20 +112,16 @@ BRANCHES = {
     'mozilla-esr31': {
         'tinderbox_tree': 'Mozilla-Esr31',
         'mobile_tinderbox_tree': 'Mozilla-Esr31',
     },
     'mozilla-esr38': {
         'tinderbox_tree': 'Mozilla-Esr38',
         'mobile_tinderbox_tree': 'Mozilla-Esr38',
     },
-    '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',
     },

--- 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-b2g34_v2_1': {
-        'gecko_version': 34,
-        'b2g_version': (2, 1, 0),
-    },
     'mozilla-b2g34_v2_1s': {
         'gecko_version': 34,
         'b2g_version': (2, 1, 0),
     },
     'mozilla-b2g37_v2_2': {
         'gecko_version': 37,
         'b2g_version': (2, 2, 0),
     },
@@ -1402,41 +1398,16 @@ BRANCHES['mozilla-b2g37_v2_2r']['gecko_l
 BRANCHES['mozilla-b2g37_v2_2r']['start_hour'] = [0, 16]
 BRANCHES['mozilla-b2g37_v2_2r']['start_minute'] = [25]
 BRANCHES['mozilla-b2g37_v2_2r']['periodic_start_minute'] = 30
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator']['enable_nightly'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-debug']['enable_nightly'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-l']['enable_nightly'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-l-debug']['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]
-BRANCHES['mozilla-b2g34_v2_1']['periodic_start_minute'] = 30
-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']['nexus-5-l']['enable_periodic'] = False
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-5-l_eng']['enable_periodic'] = False
-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
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['emulator-debug']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['emulator-jb']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['emulator-jb-debug']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['emulator-kk']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['emulator-kk-debug']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['dolphin']['enable_nightly'] = False
-BRANCHES['mozilla-b2g34_v2_1']['platforms']['dolphin_eng']['enable_nightly'] = False
-
 ######## mozilla-b2g34_v2_1s
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = 'releases/mozilla-b2g34_v2_1s'
 BRANCHES['mozilla-b2g34_v2_1s']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_1/'
 BRANCHES['mozilla-b2g34_v2_1s']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
 BRANCHES['mozilla-b2g34_v2_1s']['start_hour'] = [0]
 BRANCHES['mozilla-b2g34_v2_1s']['start_minute'] = [12]

--- 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-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:
     ACTIVE_THUNDERBIRD_BRANCHES = ACTIVE_THUNDERBIRD_PROJECT_BRANCHES[:]
@@ -50,17 +49,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-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
     # b = {'mozilla-central': {}}

--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2320,26 +2320,16 @@ BRANCHES = {
             'win64': {},
             'linux-debug': {},
             'linux64-debug': {},
             'macosx64-debug': {},
             'win32-debug': {},
             'win64-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': {},
     },
     'mozilla-b2g37_v2_2': {
@@ -2728,45 +2718,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-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]
-BRANCHES['mozilla-b2g34_v2_1']['enable_xulrunner'] = False
-BRANCHES['mozilla-b2g34_v2_1']['pgo_platforms'] = []
-BRANCHES['mozilla-b2g34_v2_1']['enable_mac_a11y'] = True
-BRANCHES['mozilla-b2g34_v2_1']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['mozilla-b2g34_v2_1']['enable_l10n'] = False
-BRANCHES['mozilla-b2g34_v2_1']['enable_l10n_onchange'] = False
-BRANCHES['mozilla-b2g34_v2_1']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-b2g34_v2_1']['l10n_platforms'] = ['linux', 'linux64',
-                                                    'win32', 'macosx64']
-BRANCHES['mozilla-b2g34_v2_1']['l10nDatedDirs'] = True
-BRANCHES['mozilla-b2g34_v2_1']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g34_v2_1'
-BRANCHES['mozilla-b2g34_v2_1']['enable_nightly'] = False
-BRANCHES['mozilla-b2g34_v2_1']['create_partial'] = False
-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']
-
 ######## mozilla-b2g34_v2_1s
 BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = 'releases/mozilla-b2g34_v2_1s'
 BRANCHES['mozilla-b2g34_v2_1s']['update_channel'] = 'nightly-b2g34-2.1s'
 BRANCHES['mozilla-b2g34_v2_1s']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
 BRANCHES['mozilla-b2g34_v2_1s']['enable_weekly_bundle'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['enable_perproduct_builds'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['start_hour'] = [3]
 BRANCHES['mozilla-b2g34_v2_1s']['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-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',
         'mobile_tinderbox_tree': 'Mozilla-B2g34-v2.1s',
     },
     'mozilla-b2g37_v2_2': {
         'packaged_unittest_tinderbox_tree': 'Mozilla-B2g37-v2.2',
         'tinderbox_tree': 'Mozilla-B2g37-v2.2',

--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -90,22 +90,16 @@ 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-b2g34_v2_1': {
-        'enable_blocklist_update': False,
-        'enable_hsts_update': False,
-        'enable_hpkp_update': False,
-        'file_update_on_closed_tree': False,
-    },
     '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,

author	Ryan VanderMeulen <ryanvm@gmail.com>
	Thu, 23 Jul 2015 10:22:13 -0400 (2015-07-23)
changeset 12700	b2b9f113f2b94100018e2d7db25771015033103d
parent 12698	f75ac37bef2c331b4dbd3eb2e30571ffd13f365e
child 12701	cc8fc0e35cf5e79fe175386e9218223ad0ac4098
push id	9085
push user	ryanvm@gmail.com
push date	Thu, 23 Jul 2015 19:41:30 +0000 (2015-07-23)
reviewers	catlee
bugs	1186285

mozilla-tests/b2g_config.py		file \| annotate \| diff \| comparison \| revisions
mozilla-tests/config.py		file \| annotate \| diff \| comparison \| revisions
mozilla-tests/production_config.py		file \| annotate \| diff \| comparison \| revisions
mozilla/b2g_config.py		file \| annotate \| diff \| comparison \| revisions
mozilla/build_localconfig.py		file \| annotate \| diff \| comparison \| revisions
mozilla/config.py		file \| annotate \| diff \| comparison \| revisions
mozilla/production_config.py		file \| annotate \| diff \| comparison \| revisions
mozilla/staging_config.py		file \| annotate \| diff \| comparison \| revisions