Bug 1541527 - Remove "-e10s" from treeherder group symbols and task labels, r=jmaher,gbrown
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Mon, 15 Apr 2019 18:18:33 +0000
changeset 469541 99e40003ff9a
parent 469540 c6c39f570b1f
child 469542 a33df20e8c10
push id35874
push userccoroiu@mozilla.com
push dateTue, 16 Apr 2019 04:04:58 +0000
treeherdermozilla-central@be3f40425b52 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, gbrown
bugs1541527
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1541527 - Remove "-e10s" from treeherder group symbols and task labels, r=jmaher,gbrown Since e10s is the default configuration, we shouldn't explicitly mark things with the "-e10s" suffix. Instead we should mark things that *don't* run with 'e10s. This patch removes '-e10s' from all treeherder group symbols and task labels, adds the "-1proc" suffix to tasks that are non-e10s. Differential Revision: https://phabricator.services.mozilla.com/D25958
taskcluster/ci/config.yml
taskcluster/taskgraph/transforms/tests.py
testing/mozbase/moztest/moztest/resolve.py
testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
testing/mozharness/mozharness/mozilla/testing/talos.py
testing/mozharness/scripts/android_emulator_unittest.py
testing/mozharness/scripts/android_hardware_unittest.py
testing/mozharness/scripts/awsy_script.py
testing/mozharness/scripts/desktop_unittest.py
testing/mozharness/scripts/marionette.py
testing/mozharness/scripts/telemetry/telemetry_client.py
testing/mozharness/scripts/web_platform_tests.py
testing/talos/talos.json
tools/tryselect/test/test_fuzzy.py
tools/tryselect/try_presets.yml
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -8,60 +8,60 @@ treeherder:
         'js-bench-v8': 'JavaScript shell benchmarks with Google V8'
         'node': 'Node tests'
         'py2': 'Python 2 unit tests'
         'py3': 'Python 3 unit tests'
         'A': 'Android Gradle tests'
         'Bpgo': 'Profile-guided optimization builds'
         'Fetch-URL': 'Fetch and store content'
         'Fxfn-l': 'Firefox functional tests (local)'
-        'Fxfn-l-e10s': 'Firefox functional tests (local) with e10s'
+        'Fxfn-l-1proc': 'Firefox functional tests (local) without e10s'
         'Fxfn-r': 'Firefox functional tests (remote)'
-        'Fxfn-r-e10s': 'Firefox functional tests (remote) with e10s'
+        'Fxfn-r-1proc': 'Firefox functional tests (remote) without e10s'
         'M': 'Mochitests'
+        'M-1proc': 'Mochitests without e10s'
+        'M-spi': 'Mochitests with socket process'
+        'M-spi-1proc': 'Mochitests with socket process without e10s'
         'M-sw': 'Mochitests with serviceworker redesign'
-        'M-spi': 'Mochitests with socket process'
-        'M-e10s': 'Mochitests with e10s'
-        'M-e10s-spi': 'Mochitests with socket process and e10s'
-        'M-sw-e10s': 'Mochitests with serviceworker redesign and e10s'
-        'M-V': 'Mochitests on Valgrind'
+        'M-sw-1proc': 'Mochitests with serviceworker redesign without e10s'
+        'M-V-1proc': 'Mochitests on Valgrind without e10s'
         'MSI': 'Repack installers into MSIs'
         'MSIs': 'Signing of Repacked installers of MSIs'
         'R': 'Reftests'
-        'R-sw': 'Reftests with serviceworker redesign enabled'
-        'R-e10s': 'Reftests with e10s'
-        'R-sw-e10s': 'Reftests with serviceworker redesign and e10s'
+        'R-1proc': 'Reftests without e10s'
+        'R-sw': 'Reftests with serviceworker redesign'
+        'R-sw-1proc': 'Reftests with serviceworker redesign enabled without e10s'
         'Rap': 'Raptor performance tests on Firefox'
-        'Rap-e10s': 'Raptor performance tests on Firefox with e10s'
-        'Rap-refbrow-e10s': 'Raptor performance tests on the reference browser'
+        'Rap-1proc': 'Raptor performance tests on Firefox without e10s'
         'Rap-Prof': 'Raptor performance tests on Firefox with Gecko Profiling'
-        'Rap-Prof-e10s': 'Raptor performance tests on Firefox with Gecko Profiling'
-        'Rap-ChC-e10s': 'Raptor performance tests on Google Chrome Canary'
-        'Rap-ChD-e10s': 'Raptor performance tests on Google Chrome Dev'
-        'Rap-Cr-e10s': 'Raptor performance tests on Google Chromium'
+        'Rap-Prof-1proc': 'Raptor performance tests on Firefox with Gecko Profiling and without e10s'
+        'Rap-ChC': 'Raptor performance tests on Google Chrome Canary'
+        'Rap-ChD': 'Raptor performance tests on Google Chrome Dev'
+        'Rap-Cr': 'Raptor performance tests on Google Chromium'
         'Rap-P': 'Raptor power tests on Firefox'
-        'Rap-P-e10s': 'Raptor power tests on Firefox with e10s'
+        'Rap-P-1proc': 'Raptor power tests on Firefox without e10s'
+        'Rap-refbrow': 'Raptor performance tests on the reference browser'
         'T': 'Talos performance tests'
-        'Tsd': 'Talos performance tests with Stylo disabled'
-        'Tss': 'Talos performance tests with Stylo sequential'
-        'T-e10s': 'Talos performance tests with e10s'
-        'Tsd-e10s': 'Talos performance tests with e10s, Stylo disabled'
-        'Tss-e10s': 'Talos performance tests with e10s, Stylo sequential'
+        'T-1proc': 'Talos performance tests without e10s'
+        'Tsd': 'Talos performance tests with e10s, Stylo disabled'
+        'Tsd-1proc': 'Talos performance tests with Stylo disabled without e10s'
+        'Tss': 'Talos performance tests with e10s, Stylo sequential'
+        'Tss-1proc': 'Talos performance tests with Stylo sequential without e10s'
         'tt': 'Telemetry tests'
-        'tt-e10s': 'Telemetry tests with e10s'
-        'SY-e10s': 'Are we slim yet tests by TaskCluster with e10s'
-        'SYsd-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo disabled'
-        'SYss-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo sequential'
+        'tt-1proc': 'Telemetry tests without e10s'
+        'SY': 'Are we slim yet tests by TaskCluster'
+        'SYsd': 'Are we slim yet tests by TaskCluster, Stylo disabled'
+        'SYss': 'Are we slim yet tests by TaskCluster, Stylo sequential'
         'VP': 'VideoPuppeteer tests'
         'W': 'Web platform tests'
+        'W-1proc': 'Web platform tests without e10s'
         'W-sw': 'Web platform tests with serviceworker redesign'
-        'W-e10s': 'Web platform tests with e10s'
-        'W-sw-e10s': 'Web platform tests with serviceworker redesign and e10s'
-        'X': 'Xpcshell tests'
-        'X-sw': 'Xpcshell tests with serviceworker redesign'
+        'W-sw-1proc': 'Web platform tests with serviceworker redesign, without e10s'
+        'X-1proc': 'Xpcshell tests, without e10s'
+        'X-sw-1proc': 'Xpcshell tests with serviceworker redesign, without e10s'
         'L10n': 'Localised Repacks'
         'L10n-Rpk': 'Localized Repackaged Repacks'
         'BM': 'Beetmover'
         'BMR': 'Beetmover repackages'
         'c-Up': 'Balrog submission of complete updates'
         'cs': 'Checksum signing'
         'css': 'Checksum signing for source'
         'rs': 'Repackage signing'
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -972,37 +972,32 @@ def split_serviceworker_e10s(config, tes
         yield test
 
 
 @transforms.add
 def split_e10s(config, tests):
     for test in tests:
         e10s = test['e10s']
 
-        test['e10s'] = False
-        test['attributes']['e10s'] = False
+        test['e10s'] = True
+        test['attributes']['e10s'] = True
 
         if e10s == 'both':
             yield copy.deepcopy(test)
-            e10s = True
-        if e10s:
-            test['test-name'] += '-e10s'
-            test['try-name'] += '-e10s'
-            test['e10s'] = True
-            test['attributes']['e10s'] = True
+            e10s = False
+        if not e10s:
+            test['test-name'] += '-1proc'
+            test['try-name'] += '-1proc'
+            test['e10s'] = False
+            test['attributes']['e10s'] = False
             group, symbol = split_symbol(test['treeherder-symbol'])
             if group != '?':
-                group += '-e10s'
+                group += '-1proc'
             test['treeherder-symbol'] = join_symbol(group, symbol)
-            if test['suite'] == 'talos' or test['suite'] == 'raptor':
-                for i, option in enumerate(test['mozharness']['extra-options']):
-                    if option.startswith('--suite='):
-                        test['mozharness']['extra-options'][i] += '-e10s'
-            else:
-                test['mozharness']['extra-options'].append('--e10s')
+            test['mozharness']['extra-options'].append('--disable-e10s')
         yield test
 
 
 @transforms.add
 def split_socketprocess_e10s(config, tests):
     for test in tests:
         if test['attributes'].get('serviceworker_e10s'):
             yield test
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -193,38 +193,38 @@ TEST_SUITES = {
         'kwargs': {'test_paths': None},
         'task_regex': ['robocop($|.*(-1|[^0-9])$)'],
     },
     'web-platform-tests': {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
         'kwargs': {'include': []},
         'task_regex': ['web-platform-tests($|.*(-1|[^0-9])$)',
-                       'test-verify-wpt-e10s'],
+                       'test-verify-wpt'],
     },
     'web-platform-tests-testharness': {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
         'kwargs': {'include': []},
         'task_regex': ['web-platform-tests(?!-reftest|-wdspec)($|.*(-1|[^0-9])$)',
-                       'test-verify-wpt-e10s'],
+                       'test-verify-wpt'],
     },
     'web-platform-tests-reftest': {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
         'kwargs': {'include': []},
         'task_regex': ['web-platform-tests-reftests($|.*(-1|[^0-9])$)',
-                       'test-verify-wpt-e10s'],
+                       'test-verify-wpt'],
     },
     'web-platform-tests-wdspec': {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
         'kwargs': {'include': []},
         'task_regex': ['web-platform-tests-wdspec($|.*(-1|[^0-9])$)',
-                       'test-verify-wpt-e10s'],
+                       'test-verify-wpt'],
     },
     'valgrind': {
         'aliases': ('v',),
         'mach_command': 'valgrind-test',
         'kwargs': {},
     },
     'xpcshell': {
         'aliases': ('x',),
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -38,21 +38,21 @@ firefox_ui_tests_config_options = [
         "default": False,
         "help": "Tries to enable the WebRender compositor.",
     }],
     [['--dry-run'], {
         'dest': 'dry_run',
         'default': False,
         'help': 'Only show what was going to be tested.',
     }],
-    [["--e10s"], {
+    [["--disable-e10s"], {
         'dest': 'e10s',
-        'action': 'store_true',
-        'default': False,
-        'help': 'Enable multi-process (e10s) mode when running tests.',
+        'action': 'store_false',
+        'default': True,
+        'help': 'Disable multi-process (e10s) mode when running tests.',
     }],
     [['--symbols-path=SYMBOLS_PATH'], {
         'dest': 'symbols_path',
         'help': 'absolute path to directory containing breakpad '
                 'symbols, or the url of a zip file containing symbols.',
     }],
     [['--tag=TAG'], {
         'dest': 'tag',
@@ -232,17 +232,16 @@ class FirefoxUITests(TestingMixin, VCSTo
 
             # Enable tracing output to log transmission protocol
             '-vv',
         ]
 
         # Collect all pass-through harness options to the script
         cmd.extend(self.query_harness_args())
 
-        # Translate deprecated --e10s flag
         if not self.config.get('e10s'):
             cmd.append('--disable-e10s')
 
         if self.symbols_url:
             cmd.extend(['--symbols-path', self.symbols_url])
 
         if self.config.get('tag'):
             cmd.extend(['--tag', self.config['tag']])
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -146,22 +146,21 @@ class Talos(TestingMixin, MercurialScrip
             "help": "Whether or not to profile the test run and save the profile results"
         }],
         [["--gecko-profile-interval"], {
             "dest": "gecko_profile_interval",
             "type": "int",
             "default": 0,
             "help": "The interval between samples taken by the profiler (milliseconds)"
         }],
-        [["--e10s"], {
+        [["--disable-e10s"], {
             "dest": "e10s",
-            "action": "store_true",
-            "default": False,
-            "help": "we should have --disable-e10s, but instead we assume non-e10s and use "
-            "--e10s to help"
+            "action": "store_false",
+            "default": True,
+            "help": "Run without multiple processes (e10s)."
         }],
         [["--enable-webrender"], {
             "action": "store_true",
             "dest": "enable_webrender",
             "default": False,
             "help": "Tries to enable the WebRender compositor.",
         }],
         [["--setpref"], {
@@ -330,18 +329,16 @@ class Talos(TestingMixin, MercurialScrip
         options = []
         # talos can't gather data if the process name ends with '.exe'
         if binary_path.endswith('.exe'):
             binary_path = binary_path[:-4]
         # options overwritten from **kw
         kw_options = {'executablePath': binary_path}
         if 'suite' in self.config:
             kw_options['suite'] = self.config['suite']
-            if self.config.get('e10s', False):
-                kw_options['suite'] = "%s-e10s" % self.config['suite']
         if self.config.get('title'):
             kw_options['title'] = self.config['title']
         if self.symbols_path:
             kw_options['symbolsPath'] = self.symbols_path
         # if using mitmproxy, we've already created a py3 venv just
         # for it; need to add the path to that env/mitdump tool
         if self.mitmdump:
             kw_options['mitmdumpPath'] = self.mitmdump
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -76,21 +76,21 @@ class AndroidEmulatorTest(TestingMixin, 
     ], [
         ["--log-tbpl-level"],
         {"action": "store",
          "dest": "log_tbpl_level",
          "default": "info",
          "help": "Set log level (debug|info|warning|error|critical|fatal)",
          }
     ], [
-        ['--e10s', ],
-        {"action": "store_true",
+        ['--disable-e10s', ],
+        {"action": "store_false",
          "dest": "e10s",
-         "default": False,
-         "help": "Run tests with multiple processes.",
+         "default": True,
+         "help": "Run tests without multiple processes (e10s).",
          }
     ], [
         ['--enable-webrender'],
         {"action": "store_true",
          "dest": "enable_webrender",
          "default": False,
          "help": "Run with WebRender enabled.",
          }
--- a/testing/mozharness/scripts/android_hardware_unittest.py
+++ b/testing/mozharness/scripts/android_hardware_unittest.py
@@ -67,21 +67,21 @@ class AndroidHardwareTest(TestingMixin, 
     ], [
         ["--log-tbpl-level"],
         {"action": "store",
          "dest": "log_tbpl_level",
          "default": "info",
          "help": "Set log level (debug|info|warning|error|critical|fatal)",
          }
     ], [
-        ['--e10s', ],
-        {"action": "store_true",
+        ['--disable-e10s', ],
+        {"action": "store_false",
          "dest": "e10s",
-         "default": False,
-         "help": "Run tests with multiple processes.",
+         "default": True,
+         "help": "Run tests without multiple processes (e10s).",
          }
     ]] + copy.deepcopy(testing_config_options)
 
     def __init__(self, require_config_file=False):
         super(AndroidHardwareTest, self).__init__(
             config_options=self.config_options,
             all_actions=['clobber',
                          'download-and-extract',
--- a/testing/mozharness/scripts/awsy_script.py
+++ b/testing/mozharness/scripts/awsy_script.py
@@ -33,21 +33,21 @@ from mozharness.mozilla.testing.codecove
 )
 
 scripts_path = os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__)))
 external_tools_path = os.path.join(scripts_path, 'external_tools')
 
 
 class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin):
     config_options = [
-        [["--e10s"],
-         {"action": "store_true",
+        [["--disable-e10s"],
+         {"action": "store_false",
           "dest": "e10s",
-          "default": False,
-          "help": "Run tests with multiple processes. (Desktop builds only)",
+          "default": True,
+          "help": "Run tests without multiple processes (e10s). (Desktop builds only)",
           }],
         [["--single-stylo-traversal"],
          {"action": "store_true",
           "dest": "single_stylo_traversal",
           "default": False,
           "help": "Set STYLO_THREADS=1.",
           }],
         [["--enable-webrender"],
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -110,21 +110,21 @@ class DesktopUnittest(TestingMixin, Merc
         [['--run-all-suites', ], {
             "action": "store_true",
             "dest": "run_all_suites",
             "default": False,
             "help": "This will run all suites that are specified "
                     "in the config file. You do not need to specify "
                     "any other suites.\nBeware, this may take a while ;)"}
          ],
-        [['--e10s', ], {
-            "action": "store_true",
+        [['--disable-e10s', ], {
+            "action": "store_false",
             "dest": "e10s",
-            "default": False,
-            "help": "Run tests with multiple processes."}
+            "default": True,
+            "help": "Run tests without multiple processes (e10s)."}
          ],
         [['--headless', ], {
             "action": "store_true",
             "dest": "headless",
             "default": False,
             "help": "Run tests in headless mode."}
          ],
         [['--no-random', ], {
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -79,21 +79,21 @@ class MarionetteTest(TestingMixin, Mercu
          }
      ], [
         ["--this-chunk"],
         {"action": "store",
          "dest": "this_chunk",
          "help": "Number of this chunk",
          }
      ], [
-        ["--e10s"],
-        {"action": "store_true",
+        ["--disable-e10s"],
+        {"action": "store_false",
          "dest": "e10s",
-         "default": False,
-         "help": "Run tests with multiple processes. (Desktop builds only)",
+         "default": True,
+         "help": "Run tests without multiple processes (e10s). (Desktop builds only)",
          }
     ], [
         ["--headless"],
         {"action": "store_true",
          "dest": "headless",
          "default": False,
          "help": "Run tests in headless mode.",
          }
--- a/testing/mozharness/scripts/telemetry/telemetry_client.py
+++ b/testing/mozharness/scripts/telemetry/telemetry_client.py
@@ -40,21 +40,21 @@ telemetry_tests_config_options = [
         "default": False,
         "help": "Tries to enable the WebRender compositor.",
     }],
     [['--dry-run'], {
         'dest': 'dry_run',
         'default': False,
         'help': 'Only show what was going to be tested.',
     }],
-    [["--e10s"], {
+    [["--disable-e10s"], {
         'dest': 'e10s',
-        'action': 'store_true',
-        'default': False,
-        'help': 'Enable multi-process (e10s) mode when running tests.',
+        'action': 'store_false',
+        'default': True,
+        'help': 'Disable multi-process (e10s) mode when running tests.',
     }],
     [['--symbols-path=SYMBOLS_PATH'], {
         'dest': 'symbols_path',
         'help': 'absolute path to directory containing breakpad '
                 'symbols, or the url of a zip file containing symbols.',
     }],
     [['--tag=TAG'], {
         'dest': 'tag',
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -34,21 +34,21 @@ from mozharness.base.log import INFO
 
 class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
     config_options = [
         [['--test-type'], {
             "action": "extend",
             "dest": "test_type",
             "help": "Specify the test types to run."}
          ],
-        [['--e10s'], {
-            "action": "store_true",
+        [['--disable-e10s'], {
+            "action": "store_false",
             "dest": "e10s",
-            "default": False,
-            "help": "Run with e10s enabled"}
+            "default": True,
+            "help": "Run without e10s enabled"}
          ],
         [["--total-chunks"], {
             "action": "store",
             "dest": "total_chunks",
             "help": "Number of total chunks"}
          ],
         [["--this-chunk"], {
             "action": "store",
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,105 +1,105 @@
 {
     "suites": {
-        "bcv-e10s": {
+        "bcv": {
             "tests": ["basic_compositor_video"]
         },
-        "chromez-e10s": {
+        "chromez": {
             "tests": ["about_preferences_basic", "tresize"]
         },
-        "dromaeojs-e10s": {
+        "dromaeojs": {
             "tests": ["dromaeo_css", "kraken"]
         },
-        "flex-e10s": {
+        "flex": {
             "tests": ["tart_flex", "ts_paint_flex"]
         },
-        "other-e10s": {
+        "other": {
             "tests": ["a11yr", "ts_paint", "tpaint", "twinopen", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint", "cpstartup", "startup_about_home_paint"]
         },
-        "sessionrestore-many-windows-e10s": {
+        "sessionrestore-many-windows": {
             "tests": ["sessionrestore_many_windows"]
         },
-        "g1-e10s": {
+        "g1": {
             "tests": ["tp5o_scroll", "glterrain"],
             "pagesets_name": "tp5n.zip"
         },
-        "damp-e10s": {
+        "damp": {
             "tests": ["damp"],
             "pagesets_name": "tp5n.zip"
         },
-        "tabswitch-e10s": {
+        "tabswitch": {
             "tests": ["tabswitch"],
             "pagesets_name": "tp5n.zip"
         },
-        "g3-e10s": {
+        "g3": {
             "tests": ["dromaeo_dom"]
         },
-        "g4-e10s": {
+        "g4": {
             "tests": ["glvideo", "displaylist_mutate", "rasterflood_svg", "rasterflood_gradient"]
         },
-        "g5-e10s": {
+        "g5": {
             "tests": ["ts_paint_webext", "tp5o_webext"],
             "pagesets_name": "tp5n.zip"
         },
-        "motionmark-e10s": {
+        "motionmark": {
             "tests": ["motionmark_animometer", "motionmark_htmlsuite", "JetStream", "ARES6"],
             "benchmark_zip": "jetstream.zip"
         },
-        "svgr-e10s": {
+        "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "tsvg_static"]
         },
-        "perf-reftest-e10s": {
+        "perf-reftest": {
             "tests": ["perf_reftest"]
         },
-        "perf-reftest-singletons-e10s": {
+        "perf-reftest-singletons": {
             "tests": ["perf_reftest_singletons"]
         },
-        "speedometer-e10s": {
+        "speedometer": {
             "tests": ["speedometer", "stylebench"]
         },
-        "tp5o-e10s": {
+        "tp5o": {
             "tests": ["tp5o"],
             "pagesets_name": "tp5n.zip"
         },
-        "xperf-e10s": {
+        "xperf": {
             "tests": ["tp5n"],
             "pagesets_name": "tp5n.zip",
             "talos_options": [
                 "--xperf_path",
                 "\"c:/Program Files (x86)/Windows Kits/10/Windows Performance Toolkit/xperf.exe\""
             ]
         },
-        "tp6-e10s": {
+        "tp6": {
             "tests": ["tp6_youtube", "tp6_amazon", "tp6_facebook"],
             "mitmproxy_release_bin_osx": "mitmproxy-2.0.2-osx.tar.gz",
             "mitmproxy_release_bin_linux64": "mitmproxy-2.0.2-linux.tar.gz",
             "mitmproxy_recording_set": "mitmproxy-recording-set-win10.zip",
             "talos_options": [
                 "--mitmproxy",
                 "mitmproxy-recording-google.mp mitmproxy-recording-youtube.mp mitmproxy-recording-amazon.mp mitmproxy-recording-facebook.mp",
                 "--firstNonBlankPaint"
             ]
         },
-        "tp6-stylo-threads-e10s": {
+        "tp6-stylo-threads": {
             "tests": ["tp6_youtube", "tp6_amazon", "tp6_facebook"],
             "mitmproxy_release_bin_osx": "mitmproxy-2.0.2-osx.tar.gz",
             "mitmproxy_release_bin_linux64": "mitmproxy-2.0.2-linux.tar.gz",
             "mitmproxy_recording_set": "mitmproxy-recording-set-win10.zip",
             "talos_options": [
                 "--stylo-threads=1",
                 "--mitmproxy",
                 "mitmproxy-recording-google.mp mitmproxy-recording-youtube.mp mitmproxy-recording-amazon.mp mitmproxy-recording-facebook.mp",
                 "--firstNonBlankPaint"
             ]
         },
-        "h1-e10s": {
+        "h1": {
             "tests": ["ts_paint_heavy"]
         },
-        "h2-e10s": {
+        "h2": {
             "tests": ["tp6_google_heavy", "tp6_youtube_heavy", "tp6_amazon_heavy", "tp6_facebook_heavy"],
             "mitmproxy_release_bin_osx": "mitmproxy-2.0.2-osx.tar.gz",
             "mitmproxy_release_bin_linux64": "mitmproxy-2.0.2-linux.tar.gz",
             "mitmproxy_recording_set": "mitmproxy-recording-set-win10.zip",
             "talos_options": [
                 "--mitmproxy",
                 "mitmproxy-recording-google.mp mitmproxy-recording-youtube.mp mitmproxy-recording-amazon.mp mitmproxy-recording-facebook.mp",
                 "--firstNonBlankPaint"
--- a/tools/tryselect/test/test_fuzzy.py
+++ b/tools/tryselect/test/test_fuzzy.py
@@ -18,16 +18,16 @@ def test_paths(run_mach, capfd):
 
     output = capfd.readouterr().out
     print(output)
 
     # If there are more than one tasks here, it means that something went wrong
     # with the path filtering.
     expected = """
     "tasks": [
-        "test-linux64/opt-xpcshell-1"
+        "test-linux64/opt-xpcshell-1proc-1"
     ]""".lstrip()
 
     assert expected in output
 
 
 if __name__ == '__main__':
     mozunit.main()
--- a/tools/tryselect/try_presets.yml
+++ b/tools/tryselect/try_presets.yml
@@ -12,17 +12,17 @@
 debugger-tests:
     selector: fuzzy
     description: >-
         Runs the tests relevant to the Firefox Devtools Debugger
     query:
         - "'debugger"
         - "'mozlint-eslint"
         - "!asan 'devtools !shippable | 'linux32 | 'macosx64"
-        - "!android !asan 'linux32 | 'macosx64 | !shippable 'mochitest-chrome | 'mochitest-clipboard-e10s"
+        - "!android !asan 'linux32 | 'macosx64 | !shippable 'mochitest-chrome | 'mochitest-clipboard"
         - "!asan !shippable 'linux64/ 'xpcshell"
         - "!qr !macosx !shippable 'damp"
 
 perf:
     selector: fuzzy
     description: >-
         Runs all performance (raptor and talos) tasks across all platforms.
         This preset can be filtered down further (e.g to limit it to a specific
@@ -38,9 +38,9 @@ sample-suites:
     description: >-
         Runs one chunk of every test suite plus all suites that aren't chunked.
         It is useful for testing infrastructure changes that can affect the
         harnesses themselves but are unlikely to break specific tests.
     query:
         - ^test- -1$
         # Only run a single talos + raptor suite per platform
         - ^test- !1$ !2$ !3$ !4$ !5$ !6$ !7$ !8$ !9$ !0$ !raptor !talos
-        - ^test- 'raptor-speedometer | 'talos-g1-e10s
+        - ^test- 'raptor-speedometer | 'talos-g1