Bug 1432515 - Enable QR test suites on all branches where the corresponding non-QR versions run. r?milan draft
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 09 May 2018 15:24:38 -0400
changeset 793220 1fe4680317169a1a671968313abd56694d4c1bc6
parent 793219 5d2deccac134ec9a3bdcf6007a708953b0bebaaa
push id109322
push userkgupta@mozilla.com
push dateWed, 09 May 2018 19:24:56 +0000
reviewersmilan
bugs1432515
milestone62.0a1
Bug 1432515 - Enable QR test suites on all branches where the corresponding non-QR versions run. r?milan Note in particular that tasks that were previously set to run on just ['mozilla-central', 'try'] will now also run on inbound and autoland, in addition to mozilla-beta and other release branches. In some cases (e.g. for talos tests) this might result in a significant increase in load on CI infrastructure. For the tasks that were already running on ['trunk', 'try'] the extra load from the release branches should be relatively small and will only take effect once 62 moves off nightly into beta. MozReview-Commit-ID: 6sn9q6rCxOK
taskcluster/ci/test/compiled.yml
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/reftest.yml
taskcluster/ci/test/talos.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/web-platform.yml
taskcluster/ci/test/xpcshell.yml
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -25,31 +25,29 @@ cppunit:
     treeherder-symbol: Cpp
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     run-on-projects:
         by-test-platform:
             windows10-64-asan/opt: []  # as an exception to windows.*
-            .*-qr/.*: ['mozilla-central', 'try']
             default: built-projects
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 gtest:
     description: "GTests run"
     suite: gtest
     treeherder-symbol: GTest
     instance-size: xlarge
     run-on-projects:
         by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
             windows.*-pgo/.*: []  # permafails on pgo
             windows.*-nightly/.*: []  # permafails on nightly too
             .*-devedition/.*: []  # don't run on devedition
             default: built-projects
     tier:
         by-test-platform:
             windows7-32-pgo.*: 3
             windows10-64-pgo.*: 3
@@ -59,20 +57,17 @@ gtest:
 jittest:
     description: "JIT Test run"
     suite: jittest/jittest-chunked
     treeherder-symbol: Jit
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: built-projects
+    run-on-projects: built-projects
     chunks:
         by-test-platform:
             windows.*: 1
             windows10-64-ccov/debug: 6
             macosx.*: 1
             android-4.3-arm7-api-15/debug: 20
             android.*: 10
             default: 6
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -24,20 +24,17 @@ job-defaults:
 mochitest:
     description: "Mochitest plain run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/plain-chunked-coverage
             default: mochitest/plain-chunked
     treeherder-symbol: M()
     loopback-video: true
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     instance-size:
         by-test-platform:
             linux64-jsdcov/opt: xlarge
             android.*: xlarge
             default: default
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 48
@@ -73,20 +70,17 @@ mochitest:
                 default: true
 
 mochitest-a11y:
     description: "Mochitest a11y run"
     suite: mochitest/a11y
     treeherder-symbol: M(a11y)
     loopback-video: true
     e10s: false
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: built-projects
+    run-on-projects: built-projects
     mozharness:
         mochitest-flavor: a11y
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 mochitest-browser-chrome:
@@ -251,20 +245,17 @@ mochitest-devtools-chrome:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 mochitest-gpu:
     description: "Mochitest GPU run"
     suite: mochitest/gpu
     treeherder-symbol: M(gpu)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     loopback-video: true
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     virtualization: virtual-with-gpu
     e10s:
         by-test-platform:
@@ -288,20 +279,17 @@ mochitest-gpu:
 mochitest-media:
     description: "Mochitest media run"
     suite: mochitest/mochitest-media
     treeherder-symbol: M(mda)
     max-run-time:
         by-test-platform:
             windows10-64-ccov/debug: 7200
             default: 5400
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     loopback-video: true
     virtualization:
         by-test-platform:
             windows10-64-qr/.*: virtual-with-gpu
             default: virtual
     instance-size:
         by-test-platform:
             android.*: xlarge
@@ -363,17 +351,16 @@ mochitest-valgrind:
 
 mochitest-webgl:
     description: "Mochitest webgl run"
     suite: mochitest/mochitest-gl
     treeherder-symbol: M(gl)
     run-on-projects:
         by-test-platform:
             windows10-64-ccov/.*: []  # Do not run on Windows ccov, see bug 1419475.
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
             default: built-projects
     virtualization: virtual-with-gpu
     chunks:
         by-test-platform:
             android.*: 10
             windows.*: 8
             default: 3
     e10s:
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -17,20 +17,17 @@ job-defaults:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
 
 crashtest:
     description: "Crashtest run"
     suite: reftest/crashtest
     treeherder-symbol: R(C)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     virtualization:
         by-test-platform:
             windows10-64-qr/.*: virtual-with-gpu
             default: virtual
@@ -49,20 +46,17 @@ crashtest:
             windows10-64-asan.*: 3
             default: default
 
 jsreftest:
     description: "JS Reftest run"
     suite: reftest/jsreftest
     schedules-component: jsreftest  # scheduling for this reftest is different from the others..
     treeherder-symbol: R(J)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 100
             android.*: 40
@@ -83,20 +77,17 @@ jsreftest:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 reftest:
     description: "Reftest run"
     suite: reftest/reftest
     treeherder-symbol: R(R)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     virtualization:
         by-test-platform:
             windows10.*: hardware
             default: virtual-with-gpu
@@ -131,20 +122,17 @@ reftest:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 reftest-fonts:
     description: "Reftest font specifc run"
     suite: reftest/reftest-fonts
     treeherder-symbol: R(Rf)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     virtualization:
         by-test-platform:
             windows10.*: hardware
             default: virtual-with-gpu
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -25,20 +25,17 @@ job-defaults:
                     - talos/linux64_config_taskcluster.py
                 default:
                     - talos/linux_config.py
 
 talos-chrome:
     description: "Talos chrome"
     try-name: chromez
     treeherder-symbol: T(c)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=chromez
 
 talos-chrome-profiling:
     description: "Talos profiling chrome"
     try-name: chromez-profiling
@@ -55,17 +52,16 @@ talos-damp:
     try-name: damp
     treeherder-symbol: T(damp)
     max-run-time:
         by-test-platform:
             linux64.*: 2700
             default: 5400
     run-on-projects:
         by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
             linux64-ccov/.*: ['try']  # Bug 1407593
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=damp
 
 talos-damp-profiling:
     description: "Talos profiling devtools"
@@ -77,20 +73,17 @@ talos-damp-profiling:
         extra-options:
             - --suite=damp
             - --geckoProfile
 
 talos-dromaeojs:
     description: "Talos dromaeojs"
     try-name: dromaeojs
     treeherder-symbol: T(d)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 2100
     mozharness:
         extra-options:
             - --suite=dromaeojs
 
 talos-dromaeojs-profiling:
     description: "Talos profiling dromaeojs"
     try-name: dromaeojs-profiling
@@ -112,20 +105,17 @@ talos-flex:
     mozharness:
         extra-options:
             - --suite=flex
 
 talos-g1:
     description: "Talos g1"
     try-name: g1
     treeherder-symbol: T(g1)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 2700
             default: 7200
     mozharness:
         extra-options:
             - --suite=g1
 
@@ -142,20 +132,17 @@ talos-g1-profiling:
         extra-options:
             - --suite=g1
             - --geckoProfile
 
 talos-g3:
     description: "Talos g3"
     try-name: g3
     treeherder-symbol: T(g3)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 900
     mozharness:
         extra-options:
             - --suite=g3
 
 talos-g3-profiling:
     description: "Talos profiling g3"
     try-name: g3-profiling
@@ -166,20 +153,17 @@ talos-g3-profiling:
         extra-options:
             - --suite=g3
             - --geckoProfile
 
 talos-g4:
     description: "Talos g4"
     try-name: g4
     treeherder-symbol: T(g4)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 1500
             default: 1800
     mozharness:
         extra-options:
             - --suite=g4
 
@@ -196,20 +180,17 @@ talos-g4-profiling:
         by-test-platform:
             linux64.*: 1500
             default: 1800
 
 talos-g5:
     description: "Talos g5"
     try-name: g5
     treeherder-symbol: T(g5)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=g5
     max-run-time:
         by-test-platform:
             linux64.*: 1200
             default: 1800
 
@@ -283,20 +264,17 @@ talos-motionmark-profiling:
         extra-options:
             - --suite=motionmark
             - --geckoProfile
 
 talos-other:
     description: "Talos other"
     try-name: other
     treeherder-symbol: T(o)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=other
 
 talos-other-profiling:
     description: "Talos profiling other"
     try-name: other-profiling
@@ -307,20 +285,17 @@ talos-other-profiling:
         extra-options:
             - --suite=other
             - --geckoProfile
 
 talos-perf-reftest:
     description: "Talos perf-reftest"
     try-name: perf-reftest
     treeherder-symbol: T(p)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest
 
 talos-perf-reftest-profiling:
     description: "Talos profiling perf-reftest"
     try-name: perf-reftest-profiling
@@ -331,20 +306,17 @@ talos-perf-reftest-profiling:
         extra-options:
             - --suite=perf-reftest
             - --geckoProfile
 
 talos-perf-reftest-singletons:
     description: "Talos perf-reftest singletons"
     try-name: perf-reftest-singletons
     treeherder-symbol: T(ps)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest-singletons
 
 talos-perf-reftest-singletons-profiling:
     description: "Talos profiling perf-reftest singletons"
     try-name: perf-reftest-singletons-profiling
@@ -355,20 +327,17 @@ talos-perf-reftest-singletons-profiling:
         extra-options:
             - --suite=perf-reftest-singletons
             - --geckoProfile
 
 talos-speedometer:
     description: "Talos speedometer"
     try-name: speedometer
     treeherder-symbol: T(sp)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=speedometer
 
 talos-speedometer-profiling:
     description: "Talos profiling speedometer"
     try-name: speedometer-profiling
@@ -379,20 +348,17 @@ talos-speedometer-profiling:
         extra-options:
             - --suite=speedometer
             - --geckoProfile
 
 talos-svgr:
     description: "Talos svgr"
     try-name: svgr
     treeherder-symbol: T(s)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=svgr
 
 talos-svgr-profiling:
     description: "Talos profiling svgr"
     try-name: svgr-profiling
@@ -403,20 +369,17 @@ talos-svgr-profiling:
         extra-options:
             - --suite=svgr
             - --geckoProfile
 
 talos-tp5o:
     description: "Talos tp5o"
     try-name: tp5o
     treeherder-symbol: T(tp)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=tp5o
 
 talos-tp5o-profiling:
     description: "Talos profiling tp5o"
     try-name: tp5o-profiling
@@ -427,20 +390,17 @@ talos-tp5o-profiling:
         extra-options:
             - --suite=tp5o
             - --geckoProfile
 
 talos-tp6:
     description: "Talos tp6"
     try-name: tp6
     treeherder-symbol: T(tp6)
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=tp6
 
 talos-tp6-profiling:
     description: "Talos profiling tp6"
     try-name: tp6-profiling
@@ -454,31 +414,29 @@ talos-tp6-profiling:
 
 talos-tp6-stylo-threads:
     description: "Talos Stylo sequential tp6"
     try-name: tp6-stylo-threads
     treeherder-symbol: Tss(tp6)
     max-run-time: 1200
     run-on-projects:
         by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
             macosx.*: ['mozilla-beta', 'autoland', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=tp6-stylo-threads
 
 talos-tps:
     description: "Talos page scroll (tps)"
     try-name: tps
     treeherder-symbol: T(tps)
     max-run-time: 900
     run-on-projects:
         by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
             linux64-ccov/.*: ['try']  # Bug 1407593
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=tps
 
 talos-tps-profiling:
     description: "Talos page scroll profiling (tps)"
@@ -493,17 +451,16 @@ talos-tps-profiling:
 
 talos-xperf:
     description: "Talos xperf"
     try-name: xperf
     treeherder-symbol: T(x)
     virtualization: virtual
     run-on-projects:
         by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
             windows7-32.*: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
             default: []
     mozharness:
         extra-options:
             - --suite=xperf
         config:
             by-test-platform:
                 windows.*:
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -83,19 +83,17 @@ linux64-asan/opt:
         - common-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
 
-# QR builds just run a subset right now. Note that the tests in this
-# test set are further restricted in {reftests,talos,...}.yml to run on
-# certain projects only, to avoid adding too much infra load.
+# QR builds just run a subset right now.
 linux64-qr/opt:
     build-platform: linux64/opt
     test-sets:
         - linux-qr-tests
         - linux-qr-talos
         - awsy
         - web-platform-tests
 linux64-qr/debug:
@@ -207,19 +205,17 @@ windows10-64-devedition/opt:
         - desktop-screenshot-capture
         - windows-tests
 
 windows10-64-asan/opt:
     build-platform: win64-asan/opt
     test-sets:
         - common-tests
 
-# QR builds just run a subset right now. Note that the tests in this
-# test set are further restricted in {reftests,talos,...}.yml to run on
-# certain projects only, to avoid adding too much infra load.
+# QR builds just run a subset right now.
 windows10-64-qr/debug:
     build-platform: win64/debug
     test-sets:
         - windows-qr-tests
 
 windows10-64-qr/opt:
     build-platform: win64/opt
     test-sets:
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -27,20 +27,17 @@ web-platform-tests:
     max-run-time:
         by-test-platform:
             windows10-64-ccov/debug: 10800
             default: 7200
     e10s:
         by-test-platform:
             linux32/debug: both
             default: true
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     mozharness:
         chunked: true
         extra-options:
             - --test-type=testharness
 
 web-platform-tests-headless:
     description: "Web platform test headless run"
     suite: web-platform-tests
@@ -77,20 +74,17 @@ web-platform-tests-reftests:
         by-test-platform:
             macosx.*: 1
             windows.*: 1
             default: 6
     e10s:
         by-test-platform:
             linux32/debug: both
             default: true
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
     mozharness:
         extra-options:
             - --test-type=reftest
 
 web-platform-tests-reftests-headless:
     description: "Web platform reftest headless run"
     suite: web-platform-tests-reftests
     treeherder-symbol: W(WrH)
@@ -117,20 +111,17 @@ web-platform-tests-reftests-headless:
 
 web-platform-tests-wdspec:
     description: "Web platform webdriver-spec run"
     suite: web-platform-tests-wdspec
     treeherder-symbol: W(Wd)
     mozharness:
         extra-options:
             - --test-type=wdspec
-    run-on-projects:
-        by-test-platform:
-            .*-qr/.*: ['trunk', 'try']  # exclude beta and project branches
-            default: built-projects
+    run-on-projects: built-projects
 
 web-platform-tests-wdspec-headless:
     description: "Web platform webdriver-spec headless run"
     suite: web-platform-tests-wdspec
     treeherder-symbol: W(WdH)
     run-on-projects: []  # disabled pending releng approval
     mozharness:
         extra-options:
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -30,17 +30,16 @@ xpcshell:
     description: "xpcshell test run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: xpcshell/xpcshell-coverage
             default: xpcshell
     treeherder-symbol: X(X)
     run-on-projects:
         by-test-platform:
-            .*-qr/.*: ['mozilla-central', 'try']
             windows10-64-asan/opt: []  # No XPCShell on ASAN yet
             default: built-projects
     chunks:
         by-test-platform:
             linux32/debug: 12
             linux64/debug: 10
             android-4.2-x86/opt: 6
             macosx.*: 1