Bug 1162032 - [buildbot-configs] Remove support for JB Flame device image builds. r=rail
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 12 May 2015 11:57:20 -0400 (2015-05-12)
changeset 12348 eb4477c3669f5323a8752a34b12c9157695afa12
parent 12347 d398c70a79c37a807cf6e3bbc18a799a64b38c6a
child 12349 dc4d17f3e288ca698072698e11ea21f37c0039e7
push id8901
push userryanvm@gmail.com
push dateTue, 12 May 2015 21:53:13 +0000 (2015-05-12)
reviewersrail
bugs1162032
Bug 1162032 - [buildbot-configs] Remove support for JB Flame device image builds. r=rail
mozilla/b2g_config.py
mozilla/b2g_project_branches.py
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -38,18 +38,16 @@ GLOBAL_VARS.update({
         'emulator-debug': {},
         'emulator-jb': {},
         'emulator-jb-debug': {},
         'emulator-kk': {},
         'emulator-kk-debug': {},
         'emulator-l': {},
         'emulator-l-debug': {},
         'linux64-b2g-haz': {},
-        'flame': {},
-        'flame_eng': {},
         'flame-kk': {},
         'flame-kk_eng': {},
         'flame-kk_eng-debug': {},
         'dolphin': {},
         'dolphin_eng': {},
         'dolphin-512': {},
         'dolphin-512_eng': {},
 
@@ -904,61 +902,16 @@ PLATFORM_VARS = {
         'consider_for_nightly': False,
         'mock_target': 'mozilla-centos6-x86_64',
         'reboot_command': [
             '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
             '-f', '../reboot_count.txt', '-n', '1', '-z'
         ],
         'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
     },
-    'flame': {
-        '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', 'flame', '--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']],
-            '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,
-    },
-    'flame_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', 'flame', '--config', 'b2g/releng-otoro-eng.py',
-                           '--gaia-languages-file', 'locales/languages_all.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,
-    },
     'flame-kk': {
         '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', 'flame-kk', '--config', 'b2g/releng-private-updates.py',
                            '--gaia-languages-file', 'locales/languages_all.json',
                            '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
@@ -1367,18 +1320,16 @@ BRANCHES['mozilla-b2g34_v2_1']['gecko_l1
 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']['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
 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
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -151,18 +151,16 @@ PROJECT_BRANCHES = {
     'cypress': {
         'lock_platforms': True,
         'platforms': {
             # Limit to B2G nexus/flame device builds (bug 1151699)
             'nexus-4': {},
             'nexus-4_eng': {},
             'nexus-5-l': {},
             'nexus-5-l_eng': {},
-            'flame': {},
-            'flame_eng': {},
             'flame-kk': {},
             'flame-kk_eng': {},
             'flame-kk_eng-debug': {},
         },
     },
     # B2G builds not required on date
     # 'date': {},
     # Dsiabled by Bug 1135702