Bug 1330412 - Convert Stylo jobs to Stylo disabled. r=jmaher
authorJ. Ryan Stinnett <jryans@gmail.com>
Thu, 31 Aug 2017 11:18:46 -0500
changeset 428531 76e1adb5416db7c07f08d15e262cd092b9409e6d
parent 428530 d6c23b724e867fceb83a036f636beafe1817007f
child 428532 62cebea1d1578461a423a9ca7848706455db9ea5
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1330412
milestone57.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 1330412 - Convert Stylo jobs to Stylo disabled. r=jmaher Convert all jobs that were exercising Stylo enabled to Stylo disabled instead. Stylo enabled is now handled by the default jobs. In Perfherder, Stylo enabled jobs will be untagged and take over the existing Gecko series. Stylo disabled jobs will have a new `stylo-disabled` tag and create a new series. MozReview-Commit-ID: BMXBRg3A95j
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
taskcluster/ci/test/tests.yml
taskcluster/taskgraph/transforms/job/mozharness_test.py
taskcluster/taskgraph/transforms/task.py
taskcluster/taskgraph/transforms/tests.py
testing/talos/talos.json
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -45,17 +45,17 @@ linux64/opt:
     build-platform: linux64/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - reftest-stylo
         - desktop-screenshot-capture
         - talos
-        - linux-talos-stylo
+        - linux-talos-stylo-disabled
         - awsy
 linux64-nightly/opt:
     build-platform: linux64-nightly/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - desktop-screenshot-capture
@@ -70,72 +70,71 @@ linux64-devedition/opt:
 
 # TODO: use 'pgo' and 'asan' labels here, instead of -pgo/opt
 linux64-pgo/opt:
     build-platform: linux64-pgo/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - talos
-        - linux-talos-stylo
+        - linux-talos-stylo-disabled
 
 linux64-asan/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - common-tests
 
-# Stylo builds only run a subset of tests for the moment. So give them
-# their own test set.
-linux32-stylo/debug:
+# Stylo disabled mode only runs a subset of tests.
+linux32-stylo-disabled/debug:
     build-platform: linux/debug
     test-sets:
-        - stylo-tests
-linux32-stylo/opt:
+        - stylo-disabled-tests
+linux32-stylo-disabled/opt:
     build-platform: linux/opt
     test-sets:
-        - awsy-stylo
-        - stylo-tests
-linux64-stylo/debug:
+        - awsy-stylo-disabled
+        - stylo-disabled-tests
+linux64-stylo-disabled/debug:
     build-platform: linux64/debug
     test-sets:
-        - stylo-tests
+        - stylo-disabled-tests
         - devtools-tests
-linux64-stylo/opt:
+linux64-stylo-disabled/opt:
     build-platform: linux64/opt
     test-sets:
-        - awsy-stylo
-        - stylo-tests
+        - awsy-stylo-disabled
+        - stylo-disabled-tests
         - devtools-tests
-macosx64-stylo/debug:
+macosx64-stylo-disabled/debug:
     build-platform: macosx64/debug
     test-sets:
-        - stylo-tests
-macosx64-stylo/opt:
+        - stylo-disabled-tests
+macosx64-stylo-disabled/opt:
     build-platform: macosx64/opt
     test-sets:
-        - awsy-stylo
-        - stylo-tests
-windows7-32-stylo/debug:
+        - awsy-stylo-disabled
+        - stylo-disabled-tests
+windows7-32-stylo-disabled/debug:
     build-platform: win32/debug
     test-sets:
-        - stylo-tests
-windows7-32-stylo/opt:
+        - stylo-disabled-tests
+windows7-32-stylo-disabled/opt:
     build-platform: win32/opt
     test-sets:
-        - awsy-stylo
-        - stylo-tests
-windows10-64-stylo/debug:
+        - awsy-stylo-disabled
+        - stylo-disabled-tests
+windows10-64-stylo-disabled/debug:
     build-platform: win64/debug
     test-sets:
-        - stylo-tests
-windows10-64-stylo/opt:
+        - stylo-disabled-tests
+windows10-64-stylo-disabled/opt:
     build-platform: win64/opt
     test-sets:
-        - awsy-stylo
-        - stylo-tests
+        - awsy-stylo-disabled
+        - stylo-disabled-tests
 
 # Stylo sequential runs check memory and performance when using a single thread.
 linux64-stylo-sequential/opt:
     build-platform: linux64/opt
     test-sets:
         - awsy-stylo-sequential
         - talos
 
@@ -173,27 +172,27 @@ windows7-32/debug:
     test-sets:
         - windows-tests
 windows7-32/opt:
     build-platform: win32/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
-        - windows-talos-stylo
+        - windows-talos-stylo-disabled
         - windows-tests
 
 windows7-32-pgo/opt:
     build-platform: win32-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-tests
         - windows-talos
-        - windows-talos-stylo
+        - windows-talos-stylo-disabled
 
 windows7-32-nightly/opt:
     build-platform: win32-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-tests
 
@@ -210,26 +209,26 @@ windows10-64/debug:
         - windows-tests
 
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
-        - windows-talos-stylo
+        - windows-talos-stylo-disabled
         - windows-tests
 
 windows10-64-pgo/opt:
     build-platform: win64-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
-        - windows-talos-stylo
+        - windows-talos-stylo-disabled
         - windows-tests
 
 windows10-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-tests
@@ -273,18 +272,18 @@ windows8-64-devedition/opt:
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - macosx64-tests
 
 macosx64/opt:
     build-platform: macosx64/opt
     test-sets:
-        - macosx64-tests-talos
-        - macosx64-tests-talos-stylo
+        - macosx64-talos
+        - macosx64-talos-stylo-disabled
         - macosx64-tests
         - desktop-screenshot-capture
         - awsy
 
 macosx64-nightly/opt:
       build-platform: macosx64-nightly/opt
       test-sets:
         - macosx64-tests
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -66,26 +66,26 @@ talos:
     - talos-svgr
     - talos-tp5o
     - talos-perf-reftest
     - talos-perf-reftest-singletons
 
 awsy:
     - awsy
 
-awsy-stylo:
-    - awsy-stylo
+awsy-stylo-disabled:
+    - awsy-stylo-disabled
 
 awsy-stylo-sequential:
     - awsy-stylo-sequential
 
 ##
 # Limited test sets for specific platforms
 
-stylo-tests:
+stylo-disabled-tests:
     - cppunit
     - crashtest
     - reftest
     - web-platform-tests
     - web-platform-tests-reftests
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
@@ -127,29 +127,29 @@ qr-tests:
     - xpcshell
 
 jsdcov-code-coverage-tests:
     - mochitest
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
     - xpcshell
 
-linux-talos-stylo:
-    - talos-chrome-stylo
-    - talos-dromaeojs-stylo
-    - talos-g1-stylo
-    - talos-g2-stylo
-    - talos-g3-stylo
-    - talos-g4-stylo
-    - talos-g5-stylo
-    - talos-other-stylo
-    - talos-svgr-stylo
-    - talos-tp5o-stylo
-    - talos-perf-reftest-stylo
-    - talos-perf-reftest-singletons-stylo
+linux-talos-stylo-disabled:
+    - talos-chrome-stylo-disabled
+    - talos-dromaeojs-stylo-disabled
+    - talos-g1-stylo-disabled
+    - talos-g2-stylo-disabled
+    - talos-g3-stylo-disabled
+    - talos-g4-stylo-disabled
+    - talos-g5-stylo-disabled
+    - talos-other-stylo-disabled
+    - talos-svgr-stylo-disabled
+    - talos-tp5o-stylo-disabled
+    - talos-perf-reftest-stylo-disabled
+    - talos-perf-reftest-singletons-stylo-disabled
 
 windows-tests:
     - cppunit
     - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
     - gtest
     - jittest
@@ -182,32 +182,32 @@ windows-talos:
     - talos-g5
     - talos-other
     - talos-perf-reftest
     - talos-perf-reftest-singletons
     - talos-svgr
     - talos-tp5o
     - talos-xperf
     - talos-tp6
+    - talos-tp6-stylo-threads
 
-windows-talos-stylo:
-    - talos-chrome-stylo
-    - talos-dromaeojs-stylo
-    - talos-g1-stylo
-    - talos-g2-stylo
-    - talos-g4-stylo
-    - talos-g5-stylo
-    - talos-other-stylo
-    - talos-perf-reftest-stylo
-    - talos-perf-reftest-singletons-stylo
-    - talos-svgr-stylo
-    - talos-tp5o-stylo
-    - talos-xperf-stylo
-    - talos-tp6-stylo
-    - talos-tp6-stylo-threads
+windows-talos-stylo-disabled:
+    - talos-chrome-stylo-disabled
+    - talos-dromaeojs-stylo-disabled
+    - talos-g1-stylo-disabled
+    - talos-g2-stylo-disabled
+    - talos-g4-stylo-disabled
+    - talos-g5-stylo-disabled
+    - talos-other-stylo-disabled
+    - talos-perf-reftest-stylo-disabled
+    - talos-perf-reftest-singletons-stylo-disabled
+    - talos-svgr-stylo-disabled
+    - talos-tp5o-stylo-disabled
+    - talos-xperf-stylo-disabled
+    - talos-tp6-stylo-disabled
 
 macosx64-tests:
     - cppunit
     - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
     - gtest
     - jittest
@@ -224,44 +224,44 @@ macosx64-tests:
     - mochitest-jetpack
     - mochitest-media
     - mochitest-webgl
     - reftest
     - web-platform-tests
     - web-platform-tests-reftests
     - xpcshell
 
-macosx64-tests-talos:
+macosx64-talos:
     - talos-chrome
     - talos-dromaeojs
     - talos-g1
     - talos-g2
     - talos-g4
     - talos-g5
     - talos-other
     - talos-svgr
     - talos-tp5o
     - talos-perf-reftest
     - talos-perf-reftest-singletons
     - talos-tp6
+    - talos-tp6-stylo-threads
 
-macosx64-tests-talos-stylo:
-    - talos-chrome-stylo
-    - talos-dromaeojs-stylo
-    - talos-g1-stylo
-    - talos-g2-stylo
-    - talos-g4-stylo
-    - talos-g5-stylo
-    - talos-other-stylo
-    - talos-svgr-stylo
-    - talos-tp5o-stylo
-    - talos-perf-reftest-stylo
-    - talos-perf-reftest-singletons-stylo
-    - talos-tp6-stylo
-    - talos-tp6-stylo-threads
+macosx64-talos-stylo-disabled:
+    - talos-chrome-stylo-disabled
+    - talos-dromaeojs-stylo-disabled
+    - talos-g1-stylo-disabled
+    - talos-g2-stylo-disabled
+    - talos-g4-stylo-disabled
+    - talos-g5-stylo-disabled
+    - talos-other-stylo-disabled
+    - talos-svgr-stylo-disabled
+    - talos-tp5o-stylo-disabled
+    - talos-perf-reftest-stylo-disabled
+    - talos-perf-reftest-singletons-stylo-disabled
+    - talos-tp6-stylo-disabled
 
 linux32-tests:
     - cppunit
     - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
     - gtest
     - jittest
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -25,20 +25,20 @@ awsy:
             by-test-platform:
                 windows.*/opt:
                     - awsy/taskcluster_windows_config.py
                 macosx.*/opt:
                     - awsy/macosx_config.py
                 default:
                     - awsy/linux_config.py
 
-awsy-stylo:
-    description: "Are we slim yet for Stylo parallel"
+awsy-stylo-disabled:
+    description: "Are we slim yet for Stylo disabled"
     suite: awsy
-    treeherder-symbol: tc-SY-stylo(sy)
+    treeherder-symbol: tc-SY-stylo-disabled(sy)
     max-run-time: 7200
     instance-size: xlarge
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
             .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             .*-devedition/.*: [] # don't run on devedition
             default: built-projects
@@ -48,17 +48,17 @@ awsy-stylo:
             by-test-platform:
                 windows.*:
                     - awsy/taskcluster_windows_config.py
                 macosx.*:
                     - awsy/macosx_config.py
                 linux.*:
                     - awsy/linux_config.py
         extra-options:
-            - --enable-stylo
+            - --disable-stylo
 
 awsy-stylo-sequential:
     description: "Are we slim yet for Stylo sequential"
     suite: awsy
     treeherder-symbol: tc-SY-stylo-seq(sy)
     max-run-time: 7200
     instance-size: xlarge
     allow-software-gl-layers: false
@@ -454,38 +454,37 @@ mochitest:
             default: legacy # Bug 1281241: migrating to m3.large instances
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 48
             android.*: 20
             macosx.*: 5
             windows.*: 5
             linux32/debug: 16
-            linux32-stylo/debug: 16
+            linux32-stylo-disabled/debug: 16
             linux.*: 10
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             windows7-32/debug: both
             default: true
     max-run-time:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 10800
             linux64-jsdcov/opt: 10800
             default: 5400
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     tier:
         by-test-platform:
-            macosx64-stylo/.*: 2
             windows10-64-asan.*: 3
             default: default
     mozharness:
         by-test-platform:
             android.*:
                 mochitest-flavor: plain
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
@@ -519,17 +518,17 @@ mochitest-a11y:
     suite: mochitest/a11y
     treeherder-symbol: tc-M(a11y)
     loopback-video: true
     e10s: false
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         chunked: false
         mochitest-flavor: a11y
         config:
@@ -555,44 +554,44 @@ mochitest-browser-chrome:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/browser-chrome-coverage
             default: mochitest/browser-chrome-chunked
     treeherder-symbol: tc-M(bc)
     loopback-video: true
     chunks:
         by-test-platform:
             linux64/debug: 16
-            linux64-stylo/debug: 16
+            linux64-stylo-disabled/debug: 16
             linux64-asan/opt: 16
             linux64-jsdcov/opt: 35
             linux32/debug: 16
-            linux32-stylo/debug: 16
+            linux32-stylo-disabled/debug: 16
             default: 7
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             windows7-32/debug: both
             default: true
     max-run-time:
         by-test-platform:
             linux64-jsdcov/opt: 7200
             linux64-ccov/opt: 7200
             linux64/debug: 5400
-            linux64-stylo/debug: 5400
+            linux64-stylo-disabled/debug: 5400
             linux32/debug: 5400
-            linux32-stylo/debug: 5400
+            linux32-stylo-disabled/debug: 5400
             default: 3600
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
         mochitest-flavor: browser
@@ -674,17 +673,17 @@ mochitest-chrome:
             android.*: 2
             default: 3
     max-run-time: 3600
     e10s: false
     run-on-projects:
         by-test-platform:
             windows7-32.*: ['try']
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows7-32.*: buildbot-bridge/buildbot-bridge
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
         by-test-platform:
@@ -715,30 +714,29 @@ mochitest-chrome:
                         linux.*:
                             - unittests/linux_unittest.py
                             - remove_executables.py
                 extra-options:
                     - --mochitest-suite=chrome
     tier:
         by-test-platform:
             windows7-32.*: 2
-            macosx64-stylo/.*: 2
             default: default
 
 mochitest-clipboard:
     description: "Mochitest clipboard run"
     suite: mochitest/clipboard
     treeherder-symbol: tc-M(cl)
     loopback-video: true
     virtualization: hardware
     instance-size: xlarge
     run-on-projects:
         by-test-platform:
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows7-32.*: buildbot-bridge/buildbot-bridge
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     e10s:
         by-test-platform:
@@ -767,20 +765,16 @@ mochitest-clipboard:
                         macosx.*:
                             - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
                             - remove_executables.py
                 extra-options:
                     - --mochitest-suite=plain-clipboard,chrome-clipboard,browser-chrome-clipboard
-    tier:
-        by-test-platform:
-            macosx64-stylo/.*: 2
-            default: default
 
 mochitest-devtools-chrome:
     description: "Mochitest devtools-chrome run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/mochitest-devtools-chrome-coverage
             default: mochitest/mochitest-devtools-chrome-chunked
     treeherder-symbol: tc-M(dt)
@@ -789,17 +783,17 @@ mochitest-devtools-chrome:
     chunks:
         by-test-platform:
             windows.*: 8
             macosx.*: 8
             default: 10
     run-on-projects:
         by-test-platform:
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             windows7-32/debug: both
             default: true
     mozharness:
@@ -842,17 +836,17 @@ mochitest-gpu:
     virtualization: virtual-with-gpu
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     e10s:
         by-test-platform:
@@ -883,17 +877,16 @@ mochitest-gpu:
                         linux.*:
                             - unittests/linux_unittest.py
                             - remove_executables.py
                 extra-options:
                     - --mochitest-suite=plain-gpu,chrome-gpu,browser-chrome-gpu
     tier:
         by-test-platform:
             linux64-qr/.*: 1
-            macosx64-stylo/.*: 2
             windows10-64-asan.*: 3
             default: default
 
 mochitest-jetpack:
     description: "Mochitest jetpack run"
     suite: mochitest/jetpack-package
     treeherder-symbol: tc-M(JP)
     loopback-video: true
@@ -938,17 +931,17 @@ mochitest-media:
             default: 3
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
         by-test-platform:
@@ -978,17 +971,16 @@ mochitest-media:
                         linux.*:
                             - unittests/linux_unittest.py
                             - remove_executables.py
                 extra-options:
                     - --mochitest-suite=mochitest-media
     tier:
         by-test-platform:
             linux64-qr/.*: 1
-            macosx64-stylo/.*: 2
             windows10-64-asan.*: 3
             default: default
 
 mochitest-valgrind:
     description: "Mochitest plain Valgrind run"
     suite: mochitest/valgrind-plain
     treeherder-symbol: tc-M-V()
     run-on-projects: []
@@ -1024,17 +1016,17 @@ mochitest-webgl:
     virtualization: virtual-with-gpu
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
             linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo/.*: ['mozilla-central', 'try']
+            macosx64-stylo.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     chunks:
         by-test-platform:
@@ -1080,17 +1072,16 @@ mochitest-webgl:
                         linux.*:
                             - unittests/linux_unittest.py
                             - remove_executables.py
                 extra-options:
                     - --mochitest-suite=mochitest-gl
     tier:
         by-test-platform:
             linux64-qr/.*: 1
-            macosx64-stylo/.*: 2
             windows10-64-asan.*: 3
             default: default
 
 reftest:
     description: "Reftest run"
     suite: reftest/reftest
     treeherder-symbol: tc-R(R)
     run-on-projects:
@@ -1313,37 +1304,37 @@ talos-chrome:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=chromez
             - --add-option
             - --webServer,localhost
 
-talos-chrome-stylo:
-    description: "Talos Stylo chrome"
+talos-chrome-stylo-disabled:
+    description: "Talos Stylo disabled chrome"
     suite: talos
-    try-name: chromez-stylo
+    try-name: chromez-stylo-disabled
     treeherder-symbol: tc-Ts(c)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=chromez-stylo
+            - --suite=chromez-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-dromaeojs:
     description: "Talos dromaeojs"
     suite: talos
     try-name: dromaeojs
     treeherder-symbol: tc-T(d)
@@ -1365,37 +1356,37 @@ talos-dromaeojs:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=dromaeojs
             - --add-option
             - --webServer,localhost
 
-talos-dromaeojs-stylo:
-    description: "Talos Stylo dromaeojs"
+talos-dromaeojs-stylo-disabled:
+    description: "Talos Stylo disabled dromaeojs"
     suite: talos
-    try-name: dromaeojs-stylo
+    try-name: dromaeojs-stylo-disabled
     treeherder-symbol: tc-Ts(d)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=dromaeojs-stylo
+            - --suite=dromaeojs-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g1:
     description: "Talos g1"
     suite: talos
     try-name: g1
     treeherder-symbol: tc-T(g1)
@@ -1417,37 +1408,37 @@ talos-g1:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=g1
             - --add-option
             - --webServer,localhost
 
-talos-g1-stylo:
-    description: "Talos Stylo g1"
+talos-g1-stylo-disabled:
+    description: "Talos Stylo disabled g1"
     suite: talos
-    try-name: g1-stylo
+    try-name: g1-stylo-disabled
     treeherder-symbol: tc-Ts(g1)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 7200
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=g1-stylo
+            - --suite=g1-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g2:
     description: "Talos g2"
     suite: talos
     try-name: g2
     treeherder-symbol: tc-T(g2)
@@ -1469,37 +1460,37 @@ talos-g2:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=g2
             - --add-option
             - --webServer,localhost
 
-talos-g2-stylo:
-    description: "Talos Stylo g2"
+talos-g2-stylo-disabled:
+    description: "Talos Stylo disabled g2"
     suite: talos
-    try-name: g2-stylo
+    try-name: g2-stylo-disabled
     treeherder-symbol: tc-Ts(g2)
     virtualization: hardware
     max-run-time: 7200
     run-on-projects: ['mozilla-central', 'try']
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=g2-stylo
+            - --suite=g2-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g3:
     description: "Talos g3"
     suite: talos
     try-name: g3
     treeherder-symbol: tc-T(g3)
@@ -1521,37 +1512,37 @@ talos-g3:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=g3
             - --add-option
             - --webServer,localhost
 
-talos-g3-stylo:
-    description: "Talos Stylo g3"
+talos-g3-stylo-disabled:
+    description: "Talos Stylo disabled g3"
     suite: talos
-    try-name: g3-stylo
+    try-name: g3-stylo-disabled
     treeherder-symbol: tc-Ts(g3)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=g3-stylo
+            - --suite=g3-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g4:
     description: "Talos g4"
     suite: talos
     try-name: g4
     treeherder-symbol: tc-T(g4)
@@ -1573,37 +1564,37 @@ talos-g4:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=g4
             - --add-option
             - --webServer,localhost
 
-talos-g4-stylo:
-    description: "Talos Stylo g4"
+talos-g4-stylo-disabled:
+    description: "Talos Stylo disabled g4"
     suite: talos
-    try-name: g4-stylo
+    try-name: g4-stylo-disabled
     treeherder-symbol: tc-Ts(g4)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=g4-stylo
+            - --suite=g4-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g5:
     description: "Talos g5"
     suite: talos
     try-name: g5
     treeherder-symbol: tc-T(g5)
@@ -1626,20 +1617,20 @@ talos-g5:
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=g5
             - --add-option
             - --webServer,localhost
 
-talos-g5-stylo:
-    description: "Talos Stylo g5"
+talos-g5-stylo-disabled:
+    description: "Talos Stylo disabled g5"
     suite: talos
-    try-name: g5-stylo
+    try-name: g5-stylo-disabled
     treeherder-symbol: tc-Ts(g5)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
@@ -1647,17 +1638,17 @@ talos-g5-stylo:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
-            - --suite=g5-stylo
+            - --suite=g5-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-other:
     description: "Talos other"
     suite: talos
     try-name: other
     treeherder-symbol: tc-T(o)
@@ -1679,37 +1670,37 @@ talos-other:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=other
             - --add-option
             - --webServer,localhost
 
-talos-other-stylo:
-    description: "Talos Stylo other"
+talos-other-stylo-disabled:
+    description: "Talos Stylo disabled other"
     suite: talos
-    try-name: other-stylo
+    try-name: other-stylo-disabled
     treeherder-symbol: tc-Ts(o)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=other-stylo
+            - --suite=other-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-perf-reftest:
     description: "Talos perf-reftest"
     suite: talos
     try-name: perf-reftest
     treeherder-symbol: tc-T(p)
@@ -1753,57 +1744,57 @@ talos-perf-reftest-singletons:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=perf-reftest-singletons
 
-talos-perf-reftest-singletons-stylo:
-    description: "Talos Stylo perf-reftest singletons"
+talos-perf-reftest-singletons-stylo-disabled:
+    description: "Talos Stylo disabled perf-reftest singletons"
     suite: talos
-    try-name: perf-reftest-singletons-stylo
+    try-name: perf-reftest-singletons-stylo-disabled
     treeherder-symbol: tc-Ts(ps)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=perf-reftest-singletons-stylo
+            - --suite=perf-reftest-singletons-stylo-disabled
 
-talos-perf-reftest-stylo:
-    description: "Talos Stylo perf-reftest"
+talos-perf-reftest-stylo-disabled:
+    description: "Talos Stylo disabled perf-reftest"
     suite: talos
-    try-name: perf-reftest-stylo
+    try-name: perf-reftest-stylo-disabled
     treeherder-symbol: tc-Ts(p)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=perf-reftest-stylo
+            - --suite=perf-reftest-stylo-disabled
 
 talos-svgr:
     description: "Talos svgr"
     suite: talos
     try-name: svgr
     treeherder-symbol: tc-T(s)
     virtualization: hardware
     run-on-projects:
@@ -1823,37 +1814,37 @@ talos-svgr:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=svgr
             - --add-option
             - --webServer,localhost
 
-talos-svgr-stylo:
-    description: "Talos Stylo svgr"
+talos-svgr-stylo-disabled:
+    description: "Talos Stylo disabled svgr"
     suite: talos
-    try-name: svgr-stylo
+    try-name: svgr-stylo-disabled
     treeherder-symbol: tc-Ts(s)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=svgr-stylo
+            - --suite=svgr-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-tp5o:
     description: "Talos tp5o"
     suite: talos
     try-name: tp5o
     treeherder-symbol: tc-T(tp)
@@ -1875,37 +1866,37 @@ talos-tp5o:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=tp5o
             - --add-option
             - --webServer,localhost
 
-talos-tp5o-stylo:
-    description: "Talos Stylo tp5o"
+talos-tp5o-stylo-disabled:
+    description: "Talos Stylo disabled tp5o"
     suite: talos
-    try-name: tp5o-stylo
+    try-name: tp5o-stylo-disabled
     treeherder-symbol: tc-Ts(tp)
     virtualization: hardware
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=tp5o-stylo
+            - --suite=tp5o-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-tp6:
     description: "Talos Tp6"
     suite: talos
     try-name: tp6
     treeherder-symbol: tc-T(tp6)
@@ -1926,20 +1917,20 @@ talos-tp6:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=tp6
             - --add-option
             - --webServer,localhost
 
-talos-tp6-stylo:
-    description: "Talos Stylo Tp6"
+talos-tp6-stylo-disabled:
+    description: "Talos Stylo disabled Tp6"
     suite: talos
-    try-name: tp6-stylo
+    try-name: tp6-stylo-disabled
     treeherder-symbol: tc-Ts(tp6s)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             windows.*: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
             macosx.*: ['mozilla-beta', 'mozilla-central', 'try']
             default: []
     max-run-time: 3600
@@ -1950,17 +1941,17 @@ talos-tp6-stylo:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=tp6-stylo
+            - --suite=tp6-stylo-disabled
 
 talos-tp6-stylo-threads:
     description: "Talos Stylo Threads Tp6"
     suite: talos
     try-name: tp6-stylo-threads
     treeherder-symbol: tc-Ts(tp6st)
     virtualization: hardware
     run-on-projects:
@@ -2005,20 +1996,20 @@ talos-xperf:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=xperf
             - --add-option
             - --webServer,localhost
 
-talos-xperf-stylo:
-    description: "Talos Stylo xperf"
+talos-xperf-stylo-disabled:
+    description: "Talos Stylo disabled xperf"
     suite: talos
-    try-name: xperf-stylo
+    try-name: xperf-stylo-disabled
     treeherder-symbol: tc-Ts(x)
     run-on-projects:
         by-test-platform:
             windows7-32.*: ['mozilla-central', 'try']
             default: []
     max-run-time: 3600
     mozharness:
         script: talos_script.py
@@ -2027,17 +2018,17 @@ talos-xperf-stylo:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
-            - --suite=xperf-stylo
+            - --suite=xperf-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 telemetry-tests-client:
     description: "Telemetry tests client run"
     suite: telemetry-tests-client
     treeherder-symbol: tc-e10s
     max-run-time: 5400
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -21,36 +21,36 @@ import os
 BUILDER_NAME_PREFIX = {
     'linux64-pgo': 'Ubuntu VM 12.04 x64',
     'linux64': 'Ubuntu VM 12.04 x64',
     'linux64-nightly': 'Ubuntu VM 12.04 x64',
     'linux64-asan': 'Ubuntu ASAN VM 12.04 x64',
     'linux64-ccov': 'Ubuntu Code Coverage VM 12.04 x64',
     'linux64-jsdcov': 'Ubuntu Code Coverage VM 12.04 x64',
     'linux64-qr': 'Ubuntu VM 12.04 x64',
-    'linux64-stylo': 'Ubuntu VM 12.04 x64',
+    'linux64-stylo-disabled': 'Ubuntu VM 12.04 x64',
     'linux64-stylo-sequential': 'Ubuntu VM 12.04 x64',
     'linux64-devedition': 'Ubuntu VM 12.04 x64',
     'linux64-devedition-nightly': 'Ubuntu VM 12.04 x64',
     'macosx64': 'Rev7 MacOSX Yosemite 10.10.5',
     'macosx64-devedition': 'Rev7 MacOSX Yosemite 10.10.5 DevEdition',
     'android-4.3-arm7-api-16': 'Android 4.3 armv7 api-16+',
     'android-4.2-x86': 'Android 4.2 x86 Emulator',
     'android-4.3-arm7-api-16-gradle': 'Android 4.3 armv7 api-16+',
     'windows10-64': 'Windows 10 64-bit',
     'windows10-64-nightly': 'Windows 10 64-bit',
     'windows10-64-pgo': 'Windows 10 64-bit',
     'windows10-64-asan': 'Windows 10 64-bit',
-    'windows10-64-stylo': 'Windows 10 64-bit',
+    'windows10-64-stylo-disabled': 'Windows 10 64-bit',
     'windows7-32': 'Windows 7 32-bit',
     ('windows7-32', 'virtual-with-gpu'): 'Windows 7 VM-GFX 32-bit',
     'windows7-32-nightly': 'Windows 7 32-bit',
     'windows7-32-devedition': 'Windows 7 32-bit DevEdition',
     'windows7-32-pgo': 'Windows 7 32-bit',
-    'windows7-32-stylo': 'Windows 7 32-bit',
+    'windows7-32-stylo-disabled': 'Windows 7 32-bit',
     'windows8-64': 'Windows 8 64-bit',
     'windows8-64-nightly': 'Windows 8 64-bit',
     'windows8-64-devedition': 'Windows 8 64-bit DevEdition',
     'windows8-64-pgo': 'Windows 8 64-bit',
 }
 
 VARIANTS = [
     'nightly',
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -477,18 +477,18 @@ GROUP_NAMES = {
     'tc-R-e10s': 'Reftests executed by TaskCluster with e10s',
     'tc-T': 'Talos performance tests executed by TaskCluster',
     'tc-Ts': 'Talos Stylo performance tests executed by TaskCluster',
     'tc-T-e10s': 'Talos performance tests executed by TaskCluster with e10s',
     'tc-Ts-e10s': 'Talos Stylo performance tests executed by TaskCluster with e10s',
     'tc-tt-c': 'Telemetry client marionette tests',
     'tc-tt-c-e10s': 'Telemetry client marionette tests with e10s',
     'tc-SY-e10s': 'Are we slim yet tests by TaskCluster with e10s',
-    'tc-SY-stylo-e10s': 'Are we slim yet tests by TaskCluster with e10s, stylo',
-    'tc-SY-stylo-seq-e10s': 'Are we slim yet tests by TaskCluster with e10s, stylo sequential',
+    'tc-SY-stylo-disabled-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo disabled',
+    'tc-SY-stylo-seq-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo sequential',
     'tc-VP': 'VideoPuppeteer tests executed by TaskCluster',
     'tc-W': 'Web platform tests executed by TaskCluster',
     'tc-W-e10s': 'Web platform tests executed by TaskCluster with e10s',
     'tc-X': 'Xpcshell tests executed by TaskCluster',
     'tc-X-e10s': 'Xpcshell tests executed by TaskCluster with e10s',
     'tc-L10n': 'Localised Repacks executed by Taskcluster',
     'tc-L10n-Rpk': 'Localized Repackaged Repacks executed by Taskcluster',
     'tc-BM-L10n': 'Beetmover for locales executed by Taskcluster',
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -61,17 +61,17 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
       'hardware': 'releng-hardware/gecko-t-win7-32-hw',
     },
     'windows7-32-devedition': {
       'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
       'hardware': 'releng-hardware/gecko-t-win7-32-hw',
     },
-    'windows7-32-stylo': {
+    'windows7-32-stylo-disabled': {
       'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
       'hardware': 'releng-hardware/gecko-t-win7-32-hw',
     },
     'windows10-64': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
@@ -86,17 +86,17 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
     'windows10-64-nightly': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
-    'windows10-64-stylo': {
+    'windows10-64-stylo-disabled': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
     'windows10-64-asan': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
@@ -501,17 +501,17 @@ def set_treeherder_machine_platform(conf
     for test in tests:
         # For most desktop platforms, the above table is not used for "regular"
         # builds, so we'll always pick the test platform here.
         # On macOS though, the regular builds are in the table.  This causes a
         # conflict in `verify_task_graph_symbol` once you add a new test
         # platform based on regular macOS builds, such as for Stylo.
         # Since it's unclear if the regular macOS builds can be removed from
         # the table, workaround the issue for Stylo.
-        if '-stylo' in test['test-platform']:
+        if '-stylo-disabled' in test['test-platform']:
             test['treeherder-machine-platform'] = test['test-platform']
         else:
             test['treeherder-machine-platform'] = translation.get(
                 test['build-platform'], test['test-platform'])
         yield test
 
 
 @transforms.add
@@ -523,34 +523,44 @@ def set_tier(config, tests):
             resolve_keyed_by(test, 'tier', item_name=test['test-name'])
 
         # only override if not set for the test
         if 'tier' not in test or test['tier'] == 'default':
             if test['test-platform'] in ['linux32/opt',
                                          'linux32/debug',
                                          'linux32-nightly/opt',
                                          'linux32-devedition/opt',
+                                         'linux32-stylo-disabled/debug',
+                                         'linux32-stylo-disabled/opt',
                                          'linux64/opt',
                                          'linux64-nightly/opt',
                                          'linux64/debug',
                                          'linux64-pgo/opt',
                                          'linux64-devedition/opt',
                                          'linux64-asan/opt',
+                                         'linux64-stylo-disabled/debug',
+                                         'linux64-stylo-disabled/opt',
                                          'windows7-32/debug',
                                          'windows7-32/opt',
                                          'windows7-32-pgo/opt',
                                          'windows7-32-devedition/opt',
                                          'windows7-32-nightly/opt',
+                                         'windows7-32-stylo-disabled/debug',
+                                         'windows7-32-stylo-disabled/opt',
                                          'windows10-64/debug',
                                          'windows10-64/opt',
                                          'windows10-64-pgo/opt',
                                          'windows10-64-devedition/opt',
                                          'windows10-64-nightly/opt',
+                                         'windows10-64-stylo-disabled/debug',
+                                         'windows10-64-stylo-disabled/opt',
                                          'macosx64/opt',
                                          'macosx64/debug',
+                                         'macosx64-stylo-disabled/debug',
+                                         'macosx64-stylo-disabled/opt',
                                          'android-4.3-arm7-api-16/opt',
                                          'android-4.3-arm7-api-16/debug',
                                          'android-4.2-x86/opt']:
                 test['tier'] = 1
             else:
                 test['tier'] = 2
         yield test
 
@@ -765,26 +775,26 @@ def set_test_type(config, tests):
     for test in tests:
         for test_type in ['mochitest', 'reftest']:
             if test_type in test['suite'] and 'web-platform' not in test['suite']:
                 test.setdefault('tags', {})['test-type'] = test_type
         yield test
 
 
 @transforms.add
-def enable_stylo(config, tests):
+def disable_stylo(config, tests):
     """
-    Force Stylo on for all its tests.
+    Disable Stylo for all jobs on `-stylo-disabled` platforms.
     """
     for test in tests:
-        if '-stylo' not in test['test-platform']:
+        if '-stylo-disabled' not in test['test-platform']:
             yield test
             continue
 
-        test['mozharness'].setdefault('extra-options', []).append('--enable-stylo')
+        test['mozharness'].setdefault('extra-options', []).append('--disable-stylo')
 
         yield test
 
 
 @transforms.add
 def single_stylo_traversal_tests(config, tests):
     """Enable single traversal for all tests on the sequential Stylo platform."""
 
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,133 +1,133 @@
 {
     "suites": {
         "chromez-e10s": {
             "tests": ["tresize", "tcanvasmark"]
         },
-        "chromez-stylo-e10s": {
-            "talos_options": ["--enable-stylo"],
+        "chromez-stylo-disabled-e10s": {
+            "talos_options": ["--disable-stylo"],
             "tests": ["tresize", "tcanvasmark"]
         },
         "dromaeojs-e10s": {
             "tests": ["dromaeo_css", "kraken"]
         },
-        "dromaeojs-stylo-e10s": {
-            "talos_options": ["--enable-stylo"],
+        "dromaeojs-stylo-disabled-e10s": {
+            "talos_options": ["--disable-stylo"],
             "tests": ["dromaeo_css", "kraken"]
         },
         "other-e10s": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint"]
         },
-        "other-stylo-e10s": {
-            "talos_options": ["--enable-stylo"],
+        "other-stylo-disabled-e10s": {
+            "talos_options": ["--disable-stylo"],
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint"]
         },
         "g1-e10s": {
             "tests": ["tp5o_scroll", "glterrain"],
             "pagesets_name": "tp5n.zip"
         },
-        "g1-stylo-e10s": {
+        "g1-stylo-disabled-e10s": {
             "tests": ["tp5o_scroll", "glterrain"],
-            "talos_options": ["--enable-stylo"],
+            "talos_options": ["--disable-stylo"],
             "pagesets_name": "tp5n.zip"
         },
         "g2-e10s": {
             "tests": ["damp", "tps"],
             "pagesets_name": "tp5n.zip"
         },
-        "g2-stylo-e10s": {
+        "g2-stylo-disabled-e10s": {
             "tests": ["damp", "tps"],
-            "talos_options": ["--enable-stylo"],
+            "talos_options": ["--disable-stylo"],
             "pagesets_name": "tp5n.zip"
         },
         "g3-e10s": {
             "tests": ["dromaeo_dom"]
         },
-        "g3-stylo-e10s": {
+        "g3-stylo-disabled-e10s": {
             "tests": ["dromaeo_dom"],
-            "talos_options": ["--enable-stylo"]
+            "talos_options": ["--disable-stylo"]
         },
         "g4-e10s": {
             "tests": ["basic_compositor_video", "glvideo"]
         },
-        "g4-stylo-e10s": {
+        "g4-stylo-disabled-e10s": {
             "tests": ["basic_compositor_video", "glvideo"],
-            "talos_options": ["--enable-stylo"]
+            "talos_options": ["--disable-stylo"]
         },
         "g5-e10s": {
             "tests": ["ts_paint_webext", "tp5o_webext"],
             "pagesets_name": "tp5n.zip"
         },
-        "g5-stylo-e10s": {
+        "g5-stylo-disabled-e10s": {
             "tests": ["ts_paint_webext", "tp5o_webext"],
-            "talos_options": ["--enable-stylo"],
+            "talos_options": ["--disable-stylo"],
             "pagesets_name": "tp5n.zip"
         },
         "svgr-e10s": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "tsvg_static"]
         },
-        "svgr-stylo-e10s": {
+        "svgr-stylo-disabled-e10s": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "tsvg_static"],
-            "talos_options": ["--enable-stylo"]
+            "talos_options": ["--disable-stylo"]
         },
         "perf-reftest-e10s": {
             "tests": ["bloom_basic"]
         },
-        "perf-reftest-stylo-e10s": {
+        "perf-reftest-stylo-disabled-e10s": {
             "tests": ["bloom_basic"],
-            "talos_options": ["--enable-stylo"]
+            "talos_options": ["--disable-stylo"]
         },
         "perf-reftest-singletons-e10s": {
             "tests": ["bloom_basic_singleton"]
         },
-        "perf-reftest-singletons-stylo-e10s": {
+        "perf-reftest-singletons-stylo-disabled-e10s": {
             "tests": ["bloom_basic_singleton"],
-            "talos_options": ["--enable-stylo"]
+            "talos_options": ["--disable-stylo"]
         },
         "tp5o-e10s": {
             "tests": ["tp5o"],
             "pagesets_name": "tp5n.zip"
         },
-        "tp5o-stylo-e10s": {
+        "tp5o-stylo-disabled-e10s": {
             "tests": ["tp5o"],
             "pagesets_name": "tp5n.zip",
-            "talos_options": ["--enable-stylo"]
+            "talos_options": ["--disable-stylo"]
         },
         "xperf-e10s": {
             "tests": ["tp5n"],
             "pagesets_name": "tp5n.zip",
             "talos_options": [
                 "--xperf_path",
                 "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""
             ]
         },
-        "xperf-stylo-e10s": {
+        "xperf-stylo-disabled-e10s": {
             "tests": ["tp5n"],
             "pagesets_name": "tp5n.zip",
             "talos_options": [
-                "--enable-stylo",
+                "--disable-stylo",
                 "--xperf_path",
                 "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""
             ]
         },
         "tp6-e10s": {
             "tests": ["tp6_google", "tp6_youtube", "tp6_amazon", "tp6_facebook"],
             "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-e10s": {
+        "tp6-stylo-disabled-e10s": {
             "tests": ["tp6_google", "tp6_youtube", "tp6_amazon", "tp6_facebook"],
             "mitmproxy_recording_set": "mitmproxy-recording-set-win10.zip",
             "talos_options": [
-                "--enable-stylo",
+                "--disable-stylo",
                 "--mitmproxy",
                 "mitmproxy-recording-google.mp mitmproxy-recording-youtube.mp mitmproxy-recording-amazon.mp mitmproxy-recording-facebook.mp",
                 "--firstNonBlankPaint"
             ]
         },
         "tp6-stylo-threads-e10s": {
             "tests": ["tp6_google", "tp6_youtube", "tp6_amazon", "tp6_facebook"],
             "mitmproxy_recording_set": "mitmproxy-recording-set-win10.zip",