Bug 1733631 - [ci] Stop keying variants by-platform in 'talos.yml', r=gbrown

Depends on D129085

Differential Revision: https://phabricator.services.mozilla.com/D129086

taskcluster/ci/test/talos.yml

@@ -31,19 +31,21 @@ talos-bcv:
     try-name: bcv
     treeherder-symbol: T(bcv)
     variants:
-        by-test-platform:
-            (linux1804-64|windows10-64|macosx1015-64).*-qr.*: [fission, webrender-sw]
-            default: [fission]
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            (linux|windows10-64|macosx1015-64)(?:shippable-qr|-qr)/.*:
-                by-variant:
-                    webrender-sw: [trunk]
+        by-variant:
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|macosx1015|windows10)-64-shippable-qr/opt: [mozilla-beta, trunk]
+                    (windows10-64|macosx1015-64).*-qr.*: [trunk]
                     default: []
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macos)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macos)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -67,9 +69,8 @@ talos-chrome:
     try-name: chromez
     treeherder-symbol: T(c)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macos).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
         by-test-platform:
             windows.*-32.*: []
@@ -100,9 +101,8 @@ talos-damp:
     treeherder-symbol: T(damp)
     max-run-time: 5400
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macos).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -110,6 +110,10 @@ talos-damp:
                     (linux1804-64|windows10-64)-shippable-qr/opt: [mozilla-central, autoland]
                     # Bug 1657864 - Disabled on macos for high frequency intermittents
                     default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx1015)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
             default:
                 by-test-platform:
                     windows.*-32-shippable.*/.*: []
@@ -211,15 +215,24 @@ talos-g1:
     try-name: g1
     treeherder-symbol: T(g1)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time:
         by-test-platform:
             linux1804-64.*: 3600
@@ -249,15 +262,24 @@ talos-g3:
     try-name: g3
     treeherder-symbol: T(g3)
     variants:
-        by-test-platform:
-            (linux1804-64|windows10-64|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 900
     mozharness:
         extra-options:
@@ -281,15 +303,17 @@ talos-g4:
     try-name: g4
     treeherder-symbol: T(g4)
     variants:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux1804-64|windows10-64|macosx1015-64).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
                 by-test-platform:
-                    (linux1804-64|windows10-64|macosx)-shippable-qr/opt: [mozilla-central, autoland]
+                    (linux1804-64|windows10-64)-shippable-qr/opt: [mozilla-central, autoland]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx1015)-64-shippable-qr/opt: [mozilla-beta, trunk]
                     default: []
             default:
                 by-test-platform:
@@ -329,15 +353,24 @@ talos-g5:
         extra-options:
             - --suite=g5
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time:
         by-test-platform:
             linux1804-64.*: 1200
@@ -432,15 +465,24 @@ talos-other:
     try-name: other
     treeherder-symbol: T(o)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 1500
     mozharness:
         extra-options:
@@ -464,15 +506,24 @@ talos-sessionrestore-many-windows:
     try-name: sessionrestore-many-windows
     treeherder-symbol: T(smw)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*/opt: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macos)(?!.*-qr).*: []
-            default: [mozilla-central, autoland]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-central, autoland]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-central, autoland]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-central, autoland]
     max-run-time: 1500
     mozharness:
         extra-options:
@@ -496,15 +547,24 @@ talos-perf-reftest:
     try-name: perf-reftest
     treeherder-symbol: T(p)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 1200
     mozharness:
         extra-options:
@@ -557,15 +617,24 @@ talos-svgr:
     try-name: svgr
     treeherder-symbol: T(s)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -589,15 +658,24 @@ talos-tp5o:
     try-name: tp5o
     treeherder-symbol: T(tp)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -621,16 +699,24 @@ talos-tabswitch:
     try-name: tabswitch
     treeherder-symbol: T(tabswitch)
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
-        by-test-platform:
-            windows.*-32.*: []
-            macosx1014.*: []
-            (linux|windows10-64|macos)(?!.*shippable).*: []
-            (linux|windows10-64|macos)(?!.*-qr).*: []
-            default: [mozilla-beta, trunk]
+        by-variant:
+            fission:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -654,16 +740,17 @@ talos-webgl:
     try-name: webgl
     treeherder-symbol: T(webgl)
     variants:
-        by-test-platform:
-            (linux1804-64|windows10-64|macosx1015-64).*-qr.*: [webgl-ipc, webrender-sw]
-            default: []
+        - webgl-ipc
+        - webrender-sw
     run-on-projects:
         by-variant:
             webgl-ipc:
                 by-test-platform:
-                    linux.*-64.*: ["trunk"]
-                    mac.*: ["trunk"]
-                    win.*: ["trunk"]
+                    (linux1804|windows10|macosx1015)-64.*: [trunk]
+                    default: []
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx1015)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
             default:
                 by-test-platform:
@@ -688,10 +775,7 @@ talos-webgl-profiling:
     treeherder-symbol: T-Prof(webgl)
     tier: 2
     variants:
-        by-test-platform:
-            android.*: []
-            windows.*-32.*: []
-            default: [webgl-ipc-profiling]
+        - webgl-ipc-profiling
     run-on-projects: []
     max-run-time: 1800
     mozharness:
@@ -710,9 +794,8 @@ talos-xperf:
             windows.*32.*: false
             windows10-64.*: true
     variants:
-        by-test-platform:
-            (linux1804-64|windows|macos).*-qr.*: [fission, webrender-sw]
-            default: []
+        - fission
+        - webrender-sw
     run-on-projects:
         by-test-platform:
             windows.*-32-shippable(?:-qr)?/.*: []