Backed out 2 changesets (bug 1460724) for Geko build bustage CLOSED TREE

Backed out changeset eec4f33ab072 (bug 1460724)
Backed out changeset d9847393a843 (bug 1460724)

taskcluster/ci/test/talos.yml

@@ -353,10 +353,7 @@ talos-svgr:
     description: "Talos svgr"
     try-name: svgr
     treeherder-symbol: T(s)
-    run-on-projects:
-        by-test-platform:
-            windows10-64-qr/.*: []  # bug 1451305
-            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:
@@ -435,7 +432,6 @@ talos-tps:
     max-run-time: 900
     run-on-projects:
         by-test-platform:
-            *-qr/.*: []  # bug 1390875
             linux64-ccov/.*: ['try']  # Bug 1407593
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:

taskcluster/ci/test/test-platforms.yml

@@ -93,7 +93,7 @@ linux64-qr/opt:
     build-platform: linux64/opt
     test-sets:
         - linux-qr-tests
-        - talos
+        - linux-qr-talos
         - awsy
         - web-platform-tests
 linux64-qr/debug:
@@ -220,7 +220,7 @@ windows10-64-qr/opt:
     build-platform: win64/opt
     test-sets:
         - windows-qr-tests
-        - windows-talos
+        - windows-qr-talos
 
 
 ##

taskcluster/ci/test/test-sets.yml

@@ -89,6 +89,24 @@ awsy-stylo-sequential:
 ##
 # Limited test sets for specific platforms
 
+linux-qr-talos:
+    - talos-chrome
+    - talos-dromaeojs
+    - talos-g1
+    # - talos-g2 # doesn't work with QR yet
+    - talos-g3
+    - talos-g4
+    - talos-g5
+    - talos-other
+    - talos-svgr
+    - talos-tp5o
+    - talos-perf-reftest
+    - talos-perf-reftest-singletons
+    - talos-tp6
+    - talos-tp6-stylo-threads
+    - talos-speedometer
+    - talos-motionmark
+
 linux-qr-tests:
     - cppunit
     - crashtest
@@ -133,6 +151,17 @@ windows-qr-tests:
     - reftest
     - reftest-fonts
 
+windows-qr-talos:
+    - talos-chrome
+    - talos-dromaeojs
+    - talos-g1
+    - talos-g4
+    - talos-perf-reftest
+    - talos-perf-reftest-singletons
+    - talos-tp5o
+    - talos-speedometer
+    - talos-motionmark
+
 jsdcov-code-coverage-tests:
     - mochitest
     - mochitest-browser-chrome