Bug 557384 - disable tjss p=lsblakk r=alice
authorLukas Blakk <lsblakk@mozilla.com>
Tue, 06 Apr 2010 09:40:04 -0700
changeset 2277 7fe293a09b7b34a1ecef7d2f12e28277f4c66851
parent 2276 4fe6ef006b2508998f537f53007a9a8c95af7add
child 2278 122ecf5f62ae5304357b21695916fd1d646afa0d
push id1749
push userlsblakk@mozilla.com
push dateTue, 06 Apr 2010 16:40:08 +0000
reviewersalice
bugs557384
Bug 557384 - disable tjss p=lsblakk r=alice
talos-pool/config.py
talos-r3/config.py
talos-staging-pool/config.py
talos-try/config.py
talos-try/master.cfg
--- a/talos-pool/config.py
+++ b/talos-pool/config.py
@@ -7,17 +7,16 @@ TALOS_CMD = ['python', 'run_tests.py', '
 
 TALOS_DIRTY_OPTS = {'talosAddOns': ['/builds/buildbot/profiles/dirtyDBs.zip', '/builds/buildbot/profiles/dirtyMaxDBs.zip']}
 
 TALOS_TP4_OPTS = {'plugins': 'zips/plugins.zip', 'pageset': 'zips/pagesets.zip'}
 
 SUITES = {
     'chrome': GRAPH_CONFIG + ['--activeTests', 'tdhtml:twinopen:tsspider:tgfx'],
     'nochrome': GRAPH_CONFIG + ['--activeTests', 'tdhtml:twinopen:tsspider:tgfx', '--noChrome'],
-    'jss': GRAPH_CONFIG + ['--activeTests', 'tjss'],
     'dirty': GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med:ts_places_generated_max:ts_cold_generated_min:ts_cold_generated_med:ts_cold_generated_max'],
     'tp4': GRAPH_CONFIG + ['--activeTests', 'tp4'],
     'cold': GRAPH_CONFIG + ['--activeTests', 'ts:ts_cold'],
     'v8': GRAPH_CONFIG + ['--activeTests', 'v8'],
     'svg': GRAPH_CONFIG + ['--activeTests', 'tsvg:tsvg_opacity'],
     'scroll': GRAPH_CONFIG + ['--activeTests', 'tscroll'],
     'dromaeo': GRAPH_CONFIG + ['--activeTests', 'dromaeo_basics:dromaeo_v8:dromaeo_sunspider:dromaeo_jslib:dromaeo_css:dromaeo_dom'],
 }
@@ -63,17 +62,16 @@ BRANCH_UNITTEST_VARS = {
 ######## mozilla-1.9.0
 BRANCHES['mozilla-1.9.0']['branch_name'] = "Firefox3.0"
 BRANCHES['mozilla-1.9.0']['build_branch'] = "1.9.0"
 BRANCHES['mozilla-1.9.0']['tinderbox_tree'] = "Firefox3.0"
 BRANCHES['mozilla-1.9.0']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.0']['fetch_symbols'] = False
 BRANCHES['mozilla-1.9.0']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.0']['jss_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['dromaeo_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['dirty_tests'] = (0, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['tp4_tests'] = (0, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['cold_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['svg_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['scroll_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['ftp_urls'] = {
@@ -104,17 +102,16 @@ BRANCHES['mozilla-1.9.0']['ftp_searchstr
 ######## mozilla-1.9.1
 BRANCHES['mozilla-1.9.1']['branch_name'] = "Firefox3.5"
 BRANCHES['mozilla-1.9.1']['build_branch'] = "1.9.1"
 BRANCHES['mozilla-1.9.1']['tinderbox_tree'] = "Firefox3.5"
 BRANCHES['mozilla-1.9.1']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.1']['fetch_symbols'] = True
 BRANCHES['mozilla-1.9.1']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.1']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['cold_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
@@ -123,33 +120,31 @@ BRANCHES['mozilla-1.9.2']['branch_name']
 BRANCHES['mozilla-1.9.2']['build_branch'] = "1.9.2"
 BRANCHES['mozilla-1.9.2']['tinderbox_tree'] = "Firefox3.6"
 BRANCHES['mozilla-1.9.2']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.2']['fetch_symbols'] = True
 BRANCHES['mozilla-1.9.2']['release_tests'] = 5
 BRANCHES['mozilla-1.9.2']['fetch_release_symbols'] = False
 BRANCHES['mozilla-1.9.2']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.2']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['cold_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## firefox-lorentz
 BRANCHES['firefox-lorentz']['branch_name'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['build_branch'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['tinderbox_tree'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['talos_command'] = TALOS_CMD
 BRANCHES['firefox-lorentz']['fetch_symbols'] = True
 BRANCHES['firefox-lorentz']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['firefox-lorentz']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['cold_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
--- a/talos-r3/config.py
+++ b/talos-r3/config.py
@@ -9,17 +9,16 @@ TALOS_CMD = ['python', 'run_tests.py', '
 
 TALOS_DIRTY_OPTS = {'talosAddOns': ['/builds/buildbot/profiles/dirtyDBs.zip', '/builds/buildbot/profiles/dirtyMaxDBs.zip']}
 
 TALOS_TP4_OPTS = {'plugins': 'zips/plugins.zip', 'pageset': 'zips/pagesets.zip'}
 
 SUITES = {
     'chrome': GRAPH_CONFIG + ['--activeTests', 'tdhtml:twinopen:tsspider:tgfx'],
     'nochrome': GRAPH_CONFIG + ['--activeTests', 'tdhtml:twinopen:tsspider:tgfx', '--noChrome'],
-    'jss': GRAPH_CONFIG + ['--activeTests', 'tjss'],
     'dirty': GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med:ts_places_generated_max:ts_cold_generated_min:ts_cold_generated_med:ts_cold_generated_max'],
     'tp4': GRAPH_CONFIG + ['--activeTests', 'tp4'],
     'cold': GRAPH_CONFIG + ['--activeTests', 'ts:ts_cold'],
     'v8': GRAPH_CONFIG + ['--activeTests', 'v8'],
     'svg': GRAPH_CONFIG + ['--activeTests', 'tsvg:tsvg_opacity'],
     'scroll': GRAPH_CONFIG + ['--activeTests', 'tscroll'],
     'dromaeo': GRAPH_CONFIG + ['--activeTests', 'dromaeo_basics:dromaeo_v8:dromaeo_sunspider:dromaeo_jslib:dromaeo_css:dromaeo_dom'],
 }
@@ -185,17 +184,16 @@ for branch in BRANCHES.keys():
 ######## mozilla-1.9.0
 BRANCHES['mozilla-1.9.0']['branch_name'] = "Firefox3.0"
 BRANCHES['mozilla-1.9.0']['build_branch'] = "1.9.0"
 BRANCHES['mozilla-1.9.0']['tinderbox_tree'] = "Firefox3.0"
 BRANCHES['mozilla-1.9.0']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.0']['fetch_symbols'] = False
 BRANCHES['mozilla-1.9.0']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.0']['jss_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['dromaeo_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['dirty_tests'] = (0, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['tp4_tests'] = (0, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['cold_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['svg_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['scroll_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['ftp_urls'] = {
@@ -226,17 +224,16 @@ BRANCHES['mozilla-1.9.0']['ftp_searchstr
 ######## mozilla-central
 BRANCHES['mozilla-central']['branch_name'] = "Firefox"
 BRANCHES['mozilla-central']['build_branch'] = "1.9.2"
 BRANCHES['mozilla-central']['tinderbox_tree'] = "Firefox"
 BRANCHES['mozilla-central']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-central']['fetch_symbols'] = True
 BRANCHES['mozilla-central']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-central']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['mozilla-central']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['repo_path'] = "mozilla-central"
@@ -246,17 +243,16 @@ BRANCHES['mozilla-central']['platforms']
 ######## mozilla-1.9.1
 BRANCHES['mozilla-1.9.1']['branch_name'] = "Firefox3.5"
 BRANCHES['mozilla-1.9.1']['build_branch'] = "1.9.1"
 BRANCHES['mozilla-1.9.1']['tinderbox_tree'] = "Firefox3.5"
 BRANCHES['mozilla-1.9.1']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.1']['fetch_symbols'] = True
 BRANCHES['mozilla-1.9.1']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.1']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['mozilla-1.9.1']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
@@ -265,101 +261,95 @@ BRANCHES['mozilla-1.9.2']['branch_name']
 BRANCHES['mozilla-1.9.2']['build_branch'] = "1.9.2"
 BRANCHES['mozilla-1.9.2']['tinderbox_tree'] = "Firefox3.6"
 BRANCHES['mozilla-1.9.2']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.2']['fetch_symbols'] = True
 BRANCHES['mozilla-1.9.2']['release_tests'] = 5
 BRANCHES['mozilla-1.9.2']['fetch_release_symbols'] = False
 BRANCHES['mozilla-1.9.2']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.2']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['mozilla-1.9.2']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## tracemonkey
 BRANCHES['tracemonkey']['branch_name'] = "TraceMonkey"
 BRANCHES['tracemonkey']['build_branch'] = "TraceMonkey"
 BRANCHES['tracemonkey']['tinderbox_tree'] = "TraceMonkey"
 BRANCHES['tracemonkey']['talos_command'] = TALOS_CMD
 BRANCHES['tracemonkey']['fetch_symbols'] = True
 BRANCHES['tracemonkey']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['tracemonkey']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['tracemonkey']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['v8_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## places
 BRANCHES['places']['branch_name'] = "Places"
 BRANCHES['places']['build_branch'] = "Places"
 BRANCHES['places']['tinderbox_tree'] = "Places"
 BRANCHES['places']['talos_command'] = TALOS_CMD
 BRANCHES['places']['fetch_symbols'] = True
 BRANCHES['places']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['places']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['places']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['places']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['places']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## electrolysis
 BRANCHES['electrolysis']['branch_name'] = "Electrolysis"
 BRANCHES['electrolysis']['build_branch'] = "Electrolysis"
 BRANCHES['electrolysis']['tinderbox_tree'] = "Electrolysis"
 BRANCHES['electrolysis']['talos_command'] = TALOS_CMD
 BRANCHES['electrolysis']['fetch_symbols'] = True
 BRANCHES['electrolysis']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['electrolysis']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['electrolysis']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['electrolysis']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['electrolysis']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## firefox-lorentz
 BRANCHES['firefox-lorentz']['branch_name'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['build_branch'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['tinderbox_tree'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['talos_command'] = TALOS_CMD
 BRANCHES['firefox-lorentz']['fetch_symbols'] = True
 BRANCHES['firefox-lorentz']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['firefox-lorentz']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['firefox-lorentz']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## addonsmgr
 BRANCHES['addonsmgr']['branch_name'] = "Addonsmgr"
 BRANCHES['addonsmgr']['build_branch'] = "Addonsmgr"
 BRANCHES['addonsmgr']['tinderbox_tree'] = "AddonsMgr"
 BRANCHES['addonsmgr']['talos_command'] = TALOS_CMD
 BRANCHES['addonsmgr']['fetch_symbols'] = True
 BRANCHES['addonsmgr']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['addonsmgr']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['addonsmgr']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
--- a/talos-staging-pool/config.py
+++ b/talos-staging-pool/config.py
@@ -10,17 +10,16 @@ TALOS_CMD = ['python', 'run_tests.py', '
 
 TALOS_DIRTY_OPTS = {'talosAddOns': ['/builds/buildbot/profiles/dirtyDBs.zip', '/builds/buildbot/profiles/dirtyMaxDBs.zip']}
 
 TALOS_TP4_OPTS = {'plugins': 'zips/plugins.zip', 'pageset': 'zips/pagesets.zip'}
 
 SUITES = {
     'chrome': GRAPH_CONFIG + ['--activeTests', 'tdhtml:twinopen:tsspider:tgfx'],
     'nochrome': GRAPH_CONFIG + ['--activeTests', 'tdhtml:twinopen:tsspider:tgfx', '--noChrome'],
-    'jss': GRAPH_CONFIG + ['--activeTests', 'tjss'],
     'dirty': GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med:ts_places_generated_max:ts_cold_generated_min:ts_cold_generated_med:ts_cold_generated_max'],
     'tp4': GRAPH_CONFIG + ['--activeTests', 'tp4'],
     'cold': GRAPH_CONFIG + ['--activeTests', 'ts:ts_cold'],
     'v8': GRAPH_CONFIG + ['--activeTests', 'v8'],
     'svg': GRAPH_CONFIG + ['--activeTests', 'tsvg:tsvg_opacity'],
     'scroll': GRAPH_CONFIG + ['--activeTests', 'tscroll'],
     'dromaeo': GRAPH_CONFIG + ['--activeTests', 'dromaeo_basics:dromaeo_v8:dromaeo_sunspider:dromaeo_jslib:dromaeo_css:dromaeo_dom'],
 }
@@ -185,17 +184,16 @@ for branch in BRANCHES.keys():
 ######## mozilla-1.9.0
 BRANCHES['mozilla-1.9.0']['branch_name'] = "Firefox3.0"
 BRANCHES['mozilla-1.9.0']['build_branch'] = "1.9.0"
 BRANCHES['mozilla-1.9.0']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['mozilla-1.9.0']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.0']['fetch_symbols'] = False
 BRANCHES['mozilla-1.9.0']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.0']['jss_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['dromaeo_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['dirty_tests'] = (0, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['tp4_tests'] = (0, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['cold_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['svg_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['scroll_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.0']['ftp_urls'] = {
@@ -226,17 +224,16 @@ BRANCHES['mozilla-1.9.0']['ftp_searchstr
 ######## mozilla-central
 BRANCHES['mozilla-central']['branch_name'] = "Firefox"
 BRANCHES['mozilla-central']['build_branch'] = "1.9.2"
 BRANCHES['mozilla-central']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['mozilla-central']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-central']['fetch_symbols'] = True
 BRANCHES['mozilla-central']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-central']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['mozilla-central']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['repo_path'] = "mozilla-central"
@@ -246,17 +243,16 @@ BRANCHES['mozilla-central']['platforms']
 ######## mozilla-1.9.1
 BRANCHES['mozilla-1.9.1']['branch_name'] = "Firefox3.5"
 BRANCHES['mozilla-1.9.1']['build_branch'] = "1.9.1"
 BRANCHES['mozilla-1.9.1']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['mozilla-1.9.1']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.1']['fetch_symbols'] = True
 BRANCHES['mozilla-1.9.1']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.1']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['mozilla-1.9.1']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.1']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
@@ -265,101 +261,95 @@ BRANCHES['mozilla-1.9.2']['branch_name']
 BRANCHES['mozilla-1.9.2']['build_branch'] = "1.9.2"
 BRANCHES['mozilla-1.9.2']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['mozilla-1.9.2']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-1.9.2']['fetch_symbols'] = True
 BRANCHES['mozilla-1.9.2']['release_tests'] = 5
 BRANCHES['mozilla-1.9.2']['fetch_release_symbols'] = False
 BRANCHES['mozilla-1.9.2']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['mozilla-1.9.2']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['mozilla-1.9.2']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-1.9.2']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## tracemonkey
 BRANCHES['tracemonkey']['branch_name'] = "TraceMonkey"
 BRANCHES['tracemonkey']['build_branch'] = "TraceMonkey"
 BRANCHES['tracemonkey']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['tracemonkey']['talos_command'] = TALOS_CMD
 BRANCHES['tracemonkey']['fetch_symbols'] = True
 BRANCHES['tracemonkey']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['tracemonkey']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['tracemonkey']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['v8_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['tracemonkey']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## places
 BRANCHES['places']['branch_name'] = "Places"
 BRANCHES['places']['build_branch'] = "Places"
 BRANCHES['places']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['places']['talos_command'] = TALOS_CMD
 BRANCHES['places']['fetch_symbols'] = True
 BRANCHES['places']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['places']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['places']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['places']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['places']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['places']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## electrolysis
 BRANCHES['electrolysis']['branch_name'] = "Electrolysis"
 BRANCHES['electrolysis']['build_branch'] = "Electrolysis"
 BRANCHES['electrolysis']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['electrolysis']['talos_command'] = TALOS_CMD
 BRANCHES['electrolysis']['fetch_symbols'] = True
 BRANCHES['electrolysis']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['nochrome_tests'] = (0, True, {}, ALL_PLATFORMS)
-BRANCHES['electrolysis']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['electrolysis']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['electrolysis']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['electrolysis']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['electrolysis']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## firefox-lorentz
 BRANCHES['firefox-lorentz']['branch_name'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['build_branch'] = "Firefox-Lorentz"
 BRANCHES['firefox-lorentz']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['firefox-lorentz']['talos_command'] = TALOS_CMD
 BRANCHES['firefox-lorentz']['fetch_symbols'] = True
 BRANCHES['firefox-lorentz']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
-BRANCHES['firefox-lorentz']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['firefox-lorentz']['svg_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['firefox-lorentz']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
 
 ######## addonsmgr
 BRANCHES['addonsmgr']['branch_name'] = "Addonsmgr"
 BRANCHES['addonsmgr']['build_branch'] = "Addonsmgr"
 BRANCHES['addonsmgr']['tinderbox_tree'] = "MozillaTest"
 BRANCHES['addonsmgr']['talos_command'] = TALOS_CMD
 BRANCHES['addonsmgr']['fetch_symbols'] = True
 BRANCHES['addonsmgr']['chrome_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['nochrome_tests'] = (0, True, {}, ALL_PLATFORMS)
-BRANCHES['addonsmgr']['jss_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['cold_tests'] = (1, True, {}, NO_WIN)
 BRANCHES['addonsmgr']['svg_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['v8_tests'] = (0, True, {}, ALL_PLATFORMS)
 BRANCHES['addonsmgr']['scroll_tests'] = (1, True, {}, ALL_PLATFORMS)
--- a/talos-try/config.py
+++ b/talos-try/config.py
@@ -1,18 +1,16 @@
 from buildbot.steps.shell import WithProperties
 
 GRAPH_CONFIG = ['--resultsServer', 'graphs-stage.mozilla.org', '--resultsLink', '/server/collect.cgi']
 
 TALOS_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:tdhtml:twinopen:tsspider:tgfx']
 
 TALOS_CMD = ['python', 'run_tests.py', '--noisy', WithProperties('%(configFile)s')]
 
-TALOS_JSS_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'tjss']
-
 TALOS_DIRTY_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med:ts_places_generated_max:ts_cold_generated_min:ts_cold_generated_med:ts_cold_generated_max']
 TALOS_DIRTY_ADDONS = ['/builds/buildbot/profiles/dirtyDBs.zip', '/builds/buildbot/profiles/dirtyMaxDBs.zip']
 
 TALOS_TP4_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'tp4']
 
 TALOS_COLD_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:ts_cold']
 
 TALOS_SVG_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'tsvg:tsvg_opacity']
--- a/talos-try/master.cfg
+++ b/talos-try/master.cfg
@@ -100,43 +100,16 @@ for platform, platform_config in PLATFOR
             branch=platform,
             treeStableTimer=0,
             builderNames=[builder['name']],
             numberOfBuildsToTrigger=1,
         )
         c['schedulers'].append(s)
         c['builders'].append(builder)
 
-        jss_factory = TryTalosFactory(
-            OS=slave_platform,
-            toolsDir="tools",
-            envName=platform_config['env_name'],
-            workdirBase="../talos-data",
-            buildBranch="Try",
-            branchName="MozillaTest",
-            configOptions=TALOS_JSS_CONFIG_OPTIONS,
-            talosCmd=TALOS_CMD,
-            fetchSymbols=False,
-        )
-        platform_name = platform_config[slave_platform]['name']
-        builder = {
-            'name': "%s try talos jss" % (platform_name),
-            'slavenames': SLAVES[slave_platform],
-            'builddir': "%s-jss" % (slave_platform),
-            'factory': jss_factory,
-        }
-        s = NoMergeMultiScheduler(name='%s jss scheduler' % (slave_platform),
-                      branch='%s' % (platform),
-                      treeStableTimer=0,
-                      builderNames=[builder['name']],
-                      numberOfBuildsToTrigger=1,
-                      )
-        c['schedulers'].append(s)
-        c['builders'].append(builder)
-
         dromaeo_factory = TryTalosFactory(
             OS=slave_platform,
             toolsDir="tools",
             envName=platform_config['env_name'],
             workdirBase="../talos-data",
             buildBranch="Try",
             branchName="MozillaTest",
             configOptions=TALOS_DROMAEO_CONFIG_OPTIONS,