Bug 1400329 - Run stylo-disabled for default branches. r=jmaher
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 20 Sep 2017 15:59:34 -0500
changeset 431669 2253d1020de58528b15e7e6333adc865d62a74c9
parent 431668 d1d44405008e744056f918457d48c0f1f714b1f2
child 431670 279ea05e310ad4d2bd028b26b80116c1128dc414
push id7785
push userryanvm@gmail.com
push dateThu, 21 Sep 2017 13:39:55 +0000
treeherdermozilla-beta@06d4034a8a03 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1400329
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 1400329 - Run stylo-disabled for default branches. r=jmaher Remove stylo-disabled branch customizations so that it runs everywhere we expect for tier 1, including beta and release. MozReview-Commit-ID: DbbiHTvCCyW
taskcluster/ci/test/tests.yml
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -34,17 +34,16 @@ awsy-stylo-disabled:
     description: "Are we slim yet for Stylo disabled"
     suite: awsy
     treeherder-symbol: tc-SYsd(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
     mozharness:
         script: awsy_script.py
         config:
             by-test-platform:
                 windows.*:
                     - awsy/taskcluster_windows_config.py
@@ -59,17 +58,16 @@ awsy-stylo-sequential:
     description: "Are we slim yet for Stylo sequential"
     suite: awsy
     treeherder-symbol: tc-SYss(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
     mozharness:
         script: awsy_script.py
         config:
             # Only run on Linux64.
             by-test-platform:
                 linux.*:
@@ -81,17 +79,16 @@ cppunit:
     description: "CPP Unit Tests"
     suite: cppunittest
     treeherder-symbol: tc(Cpp)
     e10s: false
     run-on-projects:
         by-test-platform:
             windows10-64-asan/opt: []  # as an exception to windows.*
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         by-test-platform:
             android.*:
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
                     - android/androidarm_4_3.py
@@ -119,20 +116,16 @@ cppunit:
 crashtest:
     description: "Crashtest run"
     suite: reftest/crashtest
     treeherder-symbol: tc-R(C)
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
-    run-on-projects:
-        by-test-platform:
-            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 10
             android.*: 4
             default: 1
     e10s:
         by-test-platform:
             windows7-32/debug: both
@@ -467,22 +460,16 @@ mochitest:
             windows7-32/debug: both
             default: true
     max-run-time:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 7200
             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']
-            windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
     mozharness:
         by-test-platform:
             android.*:
                 mochitest-flavor: plain
@@ -517,19 +504,16 @@ mochitest-a11y:
     description: "Mochitest a11y run"
     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']
-            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:
             by-test-platform:
@@ -539,17 +523,16 @@ mochitest-a11y:
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
         extra-options:
             - --mochitest-suite=a11y
     tier:
         by-test-platform:
-            .*-stylo.*: 2
             windows10-64-asan.*: 3
             default: default
 
 mochitest-browser-chrome:
     description: "Mochitest browser-chrome run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/browser-chrome-coverage
@@ -574,22 +557,16 @@ mochitest-browser-chrome:
         by-test-platform:
             linux64-jsdcov/opt: 7200
             linux64-ccov/opt: 7200
             linux64/debug: 5400
             linux64-stylo-disabled/debug: 5400
             linux32/debug: 5400
             linux32-stylo-disabled/debug: 5400
             default: 3600
-    run-on-projects:
-        by-test-platform:
-            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo.*: ['mozilla-central', 'try']
-            windows.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     worker-type:
         by-test-platform:
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
         mochitest-flavor: browser
         script: desktop_unittest.py
         no-read-buildbot-config: true
@@ -612,17 +589,16 @@ mochitest-browser-chrome:
     # Bug 1281241: migrating to m3.large instances
     instance-size:
         by-test-platform:
             linux64-jsdcov/opt: xlarge
             default: legacy
     allow-software-gl-layers: false
     tier:
         by-test-platform:
-            .*-stylo.*: 2
             windows10-64-asan.*: 3
             default: default
 
 mochitest-browser-screenshots:
     description: "Mochitest Browser Screenshots"
     suite: mochitest/browser-chrome-screenshots
     treeherder-symbol: tc-M(ss)
     loopback-video: true
@@ -664,22 +640,16 @@ mochitest-chrome:
             default: default
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 4
             android.*: 2
             default: 3
     max-run-time: 3600
     e10s: false
-    run-on-projects:
-        by-test-platform:
-            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo.*: ['mozilla-central', 'try']
-            windows.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     mozharness:
         by-test-platform:
             android.*:
                 mochitest-flavor: chrome
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
                     by-test-platform:
@@ -713,21 +683,16 @@ mochitest-chrome:
 
 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']
-            default: built-projects
     worker-type:
         by-test-platform:
             windows7-32.*: buildbot-bridge/buildbot-bridge
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     e10s:
         by-test-platform:
             windows7-32/debug: both
@@ -770,22 +735,16 @@ mochitest-devtools-chrome:
     treeherder-symbol: tc-M(dt)
     loopback-video: true
     max-run-time: 5400
     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']
-            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:
         mochitest-flavor: chrome
         script: desktop_unittest.py
@@ -819,22 +778,16 @@ mochitest-devtools-chrome:
             default: default
 
 mochitest-gpu:
     description: "Mochitest GPU run"
     suite: mochitest/gpu
     treeherder-symbol: tc-M(gpu)
     loopback-video: true
     virtualization: virtual-with-gpu
-    run-on-projects:
-        by-test-platform:
-            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo.*: ['mozilla-central', 'try']
-            windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     worker-type:
         by-test-platform:
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     e10s:
         by-test-platform:
             windows7-32/debug: both
             default: true
@@ -882,22 +835,16 @@ mochitest-media:
             android.*: xlarge
             default: large
     chunks:
         by-test-platform:
             android.*: 3
             macosx64.*: 1
             windows10-64.*: 1
             default: 3
-    run-on-projects:
-        by-test-platform:
-            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo.*: ['mozilla-central', 'try']
-            windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     worker-type:
         by-test-platform:
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
         by-test-platform:
             android.*:
                 mochitest-flavor: plain
@@ -963,22 +910,16 @@ mochitest-valgrind:
         extra-options:
             - --mochitest-suite=valgrind-plain
 
 mochitest-webgl:
     description: "Mochitest webgl run"
     suite: mochitest/mochitest-gl
     treeherder-symbol: tc-M(gl)
     virtualization: virtual-with-gpu
-    run-on-projects:
-        by-test-platform:
-            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo.*: ['mozilla-central', 'try']
-            windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     worker-type:
         by-test-platform:
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     chunks:
         by-test-platform:
             android.*: 10
             default: 3
@@ -1029,22 +970,16 @@ mochitest-webgl:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 reftest:
     description: "Reftest run"
     suite: reftest/reftest
     treeherder-symbol: tc-R(R)
-    run-on-projects:
-        by-test-platform:
-            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            macosx64-stylo.*: ['autoland', 'mozilla-central', 'try']
-            windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     worker-type:
         by-test-platform:
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
@@ -1232,17 +1167,16 @@ talos-chrome:
     description: "Talos chrome"
     suite: talos
     try-name: chromez
     treeherder-symbol: tc-T(c)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1257,17 +1191,17 @@ talos-chrome:
             - --webServer,localhost
 
 talos-chrome-stylo-disabled:
     description: "Talos Stylo disabled chrome"
     suite: talos
     try-name: chromez-stylo-disabled
     treeherder-symbol: tc-Tsd(c)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1284,17 +1218,16 @@ talos-dromaeojs:
     description: "Talos dromaeojs"
     suite: talos
     try-name: dromaeojs
     treeherder-symbol: tc-T(d)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1309,17 +1242,17 @@ talos-dromaeojs:
             - --webServer,localhost
 
 talos-dromaeojs-stylo-disabled:
     description: "Talos Stylo disabled dromaeojs"
     suite: talos
     try-name: dromaeojs-stylo-disabled
     treeherder-symbol: tc-Tsd(d)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1336,17 +1269,16 @@ talos-g1:
     description: "Talos g1"
     suite: talos
     try-name: g1
     treeherder-symbol: tc-T(g1)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 7200
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1361,17 +1293,17 @@ talos-g1:
             - --webServer,localhost
 
 talos-g1-stylo-disabled:
     description: "Talos Stylo disabled g1"
     suite: talos
     try-name: g1-stylo-disabled
     treeherder-symbol: tc-Tsd(g1)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1389,17 +1321,16 @@ talos-g2:
     suite: talos
     try-name: g2
     treeherder-symbol: tc-T(g2)
     virtualization: hardware
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1414,17 +1345,17 @@ talos-g2:
 
 talos-g2-stylo-disabled:
     description: "Talos Stylo disabled g2"
     suite: talos
     try-name: g2-stylo-disabled
     treeherder-symbol: tc-Tsd(g2)
     virtualization: hardware
     max-run-time: 7200
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
@@ -1440,17 +1371,16 @@ talos-g3:
     description: "Talos g3"
     suite: talos
     try-name: g3
     treeherder-symbol: tc-T(g3)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1465,17 +1395,17 @@ talos-g3:
             - --webServer,localhost
 
 talos-g3-stylo-disabled:
     description: "Talos Stylo disabled g3"
     suite: talos
     try-name: g3-stylo-disabled
     treeherder-symbol: tc-Tsd(g3)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1492,17 +1422,16 @@ talos-g4:
     description: "Talos g4"
     suite: talos
     try-name: g4
     treeherder-symbol: tc-T(g4)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1517,17 +1446,17 @@ talos-g4:
             - --webServer,localhost
 
 talos-g4-stylo-disabled:
     description: "Talos Stylo disabled g4"
     suite: talos
     try-name: g4-stylo-disabled
     treeherder-symbol: tc-Tsd(g4)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1544,17 +1473,16 @@ talos-g5:
     description: "Talos g5"
     suite: talos
     try-name: g5
     treeherder-symbol: tc-T(g5)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1570,17 +1498,17 @@ talos-g5:
             - --webServer,localhost
 
 talos-g5-stylo-disabled:
     description: "Talos Stylo disabled g5"
     suite: talos
     try-name: g5-stylo-disabled
     treeherder-symbol: tc-Tsd(g5)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1598,17 +1526,16 @@ talos-other:
     description: "Talos other"
     suite: talos
     try-name: other
     treeherder-symbol: tc-T(o)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1623,17 +1550,17 @@ talos-other:
             - --webServer,localhost
 
 talos-other-stylo-disabled:
     description: "Talos Stylo disabled other"
     suite: talos
     try-name: other-stylo-disabled
     treeherder-symbol: tc-Tsd(o)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1650,17 +1577,16 @@ talos-perf-reftest:
     description: "Talos perf-reftest"
     suite: talos
     try-name: perf-reftest
     treeherder-symbol: tc-T(p)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
@@ -1674,17 +1600,16 @@ talos-perf-reftest-singletons:
     description: "Talos perf-reftest singletons"
     suite: talos
     try-name: perf-reftest-singletons
     treeherder-symbol: tc-T(ps)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1742,17 +1667,16 @@ talos-svgr:
     description: "Talos svgr"
     suite: talos
     try-name: svgr
     treeherder-symbol: tc-T(s)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1767,17 +1691,17 @@ talos-svgr:
             - --webServer,localhost
 
 talos-svgr-stylo-disabled:
     description: "Talos Stylo disabled svgr"
     suite: talos
     try-name: svgr-stylo-disabled
     treeherder-symbol: tc-Tsd(s)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1794,17 +1718,16 @@ talos-tp5o:
     description: "Talos tp5o"
     suite: talos
     try-name: tp5o
     treeherder-symbol: tc-T(tp)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1819,17 +1742,17 @@ talos-tp5o:
             - --webServer,localhost
 
 talos-tp5o-stylo-disabled:
     description: "Talos Stylo disabled tp5o"
     suite: talos
     try-name: tp5o-stylo-disabled
     treeherder-symbol: tc-Tsd(tp)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', '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
@@ -1924,17 +1847,16 @@ talos-tp6-stylo-threads:
 talos-xperf:
     description: "Talos xperf"
     suite: talos
     try-name: xperf
     treeherder-symbol: tc-T(x)
     run-on-projects:
         by-test-platform:
             windows7-32.*: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try', 'date']
-            .*-stylo.*: ['mozilla-central', 'try']
             default: []
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1950,17 +1872,17 @@ talos-xperf:
 
 talos-xperf-stylo-disabled:
     description: "Talos Stylo disabled xperf"
     suite: talos
     try-name: xperf-stylo-disabled
     treeherder-symbol: tc-Tsd(x)
     run-on-projects:
         by-test-platform:
-            windows7-32.*: ['mozilla-central', 'try']
+            windows7-32.*: ['mozilla-beta', 'mozilla-central', 'try']
             default: []
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -2030,20 +1952,16 @@ web-platform-tests:
     treeherder-symbol: tc-W(wpt)
     chunks:
       by-test-platform:
         macosx64/opt: 5
         macosx64/debug: 10
         default: 12
     max-run-time: 7200
     instance-size: xlarge
-    run-on-projects:
-        by-test-platform:
-            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     e10s:
         by-test-platform:
             windows7-32/debug: both
             default: true
     mozharness:
         script: web_platform_tests.py
         no-read-buildbot-config: true
         chunked: true
@@ -2105,20 +2023,16 @@ web-platform-tests-reftests:
     treeherder-symbol: tc-W(Wr)
     max-run-time: 5400
     instance-size: xlarge
     chunks:
       by-test-platform:
         macosx.*: 1
         windows.*: 1
         default: 6
-    run-on-projects:
-        by-test-platform:
-            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
     e10s:
         by-test-platform:
             windows7-32/debug: both
             default: true
     mozharness:
         script: web_platform_tests.py
         no-read-buildbot-config: true
         config: