Bug 991476 - Decommission the ionmonkey tree. r=catlee
authorJustin Wood <Callek@gmail.com>
Thu, 03 Apr 2014 11:49:21 -0400
changeset 10145 ccddeced8b8a84030e21f3dc86f370a186f6ae5a
parent 10143 637e30ede8a6279429a81b7d1e74509e1196f8d4
child 10146 ad21288639b26e9d12b368570cb28396662031c3
push id7520
push userCallek@gmail.com
push dateFri, 04 Apr 2014 16:07:29 +0000
reviewerscatlee
bugs991476
Bug 991476 - Decommission the ionmonkey tree. r=catlee
mozilla-tests/b2g_config.py
mozilla/b2g_project_branches.py
mozilla/project_branches.py
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -52,17 +52,16 @@ BRANCHES = {
     'mozilla-aurora': {
         'gecko_version': 30,
         'b2g_version': (1, 4, 0),
     },
     'mozilla-central': {},
     'mozilla-inbound': {},
     'b2g-inbound': {},
     'services-central': {},
-    'ionmonkey': {},
     'try': {'coallesce_jobs': False},
 }
 
 setMainFirefoxVersions(BRANCHES)
 
 PLATFORMS = {
     'linux32_gecko': {},
     'linux64_gecko': {},
@@ -1730,17 +1729,16 @@ BRANCHES['pine']['platforms']['emulator'
 BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = \
     MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL
 BRANCHES['pine']['platforms']['linux32_gecko']['ubuntu32_vm-b2gdt']['opt_unittest_suites'] += GAIA_UI
 BRANCHES['cypress']['branch_name'] = "Cypress"
 BRANCHES['cypress']['repo_path'] = "projects/cypress"
 BRANCHES['cypress']['mozharness_tag'] = "default"
 BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
 BRANCHES['graphics']['repo_path'] = "projects/graphics"
-BRANCHES['ionmonkey']['repo_path'] = "projects/ionmonkey"
 BRANCHES['mozilla-b2g18']['repo_path'] = "releases/mozilla-b2g18"
 BRANCHES['mozilla-b2g18']['platforms']['emulator']['enable_debug_unittests'] = False
 BRANCHES['mozilla-b2g18']['platforms']['emulator']['fedora-b2g-emulator']['opt_unittest_suites'] = MARIONETTE + REFTEST_SANITY
 BRANCHES['mozilla-b2g18_v1_1_0_hd']['repo_path'] = "releases/mozilla-b2g18_v1_1_0_hd"
 BRANCHES['mozilla-b2g18_v1_1_0_hd']['platforms']['emulator']['fedora-b2g-emulator']['opt_unittest_suites'] = MARIONETTE + REFTEST_SANITY
 BRANCHES['mozilla-b2g18_v1_1_0_hd']['platforms']['emulator']['enable_debug_unittests'] = False
 BRANCHES['mozilla-b2g26_v1_2']['repo_path'] = "releases/mozilla-b2g26_v1_2"
 BRANCHES['mozilla-b2g26_v1_2']['platforms']['emulator']['enable_debug_unittests'] = False
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -3,19 +3,16 @@ PROJECT_BRANCHES = {
     ### PLEASE ADD NEW BRANCHES ALPHABETICALLY (twigs at the bottom, also alphabetically)
     'build-system': {},
     'fx-team': {
         'repo_path': 'integration/fx-team',
         'enable_perproduct_builds': True,
         'enable_nightly': False,
     },
     'graphics': {},
-    'ionmonkey': {
-        'enable_nightly': True
-    },
     # Please sync any customizations made to mozilla-inbound to cypress.
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
         'enable_perproduct_builds': True,
     },
     'b2g-inbound': {
         'repo_path': 'integration/b2g-inbound',
         'enable_perproduct_builds': True,
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -15,24 +15,16 @@ PROJECT_BRANCHES = {
         'enable_nightly': False,
         'pgo_strategy': 'periodic',
         'periodic_interval': 3,
         'enable_weekly_bundle': True,
     },
     'graphics': {
         'enable_talos': False,
     },
-    'ionmonkey': {
-        'mozconfig_dir': 'mozilla-central',
-        'enable_nightly': True,
-        'create_snippet': True,
-        'create_partial': True,
-        'pgo_strategy': 'periodic',
-        'branch_projects': ['spidermonkey_tier_1', 'spidermonkey_info'],
-    },
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
         'enable_perproduct_builds': True,
         'mozconfig_dir': 'mozilla-central',
         'enable_weekly_bundle': True,
         'pgo_strategy': 'periodic',
         'periodic_interval': 3,
         'talos_suites': {