Bug 1733631 - [taskgraph] Don't override 'run-on-projects' from 'webgl-ipc' variant, r=jmaher

This does not add or remove any tasks.

Depends on D128800

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

taskcluster/ci/test/mochitest.yml

@@ -490,11 +490,10 @@ mochitest-media:
                     default: built-projects
             webgl-ipc:
                 by-test-platform:
-                    .*-tsan-qr/opt: ['trunk']
-                    windows10-64-2004-asan-qr/opt: ['trunk']
-                    (linux.*64|windows10-64-2004)(-shippable)?-qr/(opt|debug): ['trunk']
-                    (linux|windows10-64-2004|macos)(?!.*-qr).*: []
-                    default: built-projects
+                    linux.*-64.*: ["trunk"]
+                    mac.*: ["trunk"]
+                    win.*: ["trunk"]
+                    default: []
             default:
                 by-test-platform:
                     android-hw-.*/opt: []
@@ -663,11 +662,19 @@ mochitest-webgl1-core:
             macosx.*64-ccov.*/.*: 7200
             default: 1800
     run-on-projects:
-        by-test-platform:
-            .*-tsan-qr/opt: ['trunk']
-            android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
-            default: built-projects
+        by-variant:
+            webgl-ipc:
+                by-test-platform:
+                    linux.*-64.*: ["trunk"]
+                    mac.*: ["trunk"]
+                    win.*: ["trunk"]
+                    default: []
+            default:
+                by-test-platform:
+                    .*-tsan-qr/opt: ['trunk']
+                    android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
+                    android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
+                    default: built-projects
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
     allow-software-gl-layers: false
     mozharness:
@@ -699,11 +706,19 @@ mochitest-webgl1-ext:
     loopback-video: true
     max-run-time: 2700
     run-on-projects:
-        by-test-platform:
-            .*-tsan-qr/opt: ['trunk']
-            android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
-            default: built-projects
+        by-variant:
+            webgl-ipc:
+                by-test-platform:
+                    linux.*-64.*: ["trunk"]
+                    mac.*: ["trunk"]
+                    win.*: ["trunk"]
+                    default: []
+            default:
+                by-test-platform:
+                    .*-tsan-qr/opt: ['trunk']
+                    android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
+                    android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
+                    default: built-projects
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
     allow-software-gl-layers: false
     mozharness:
@@ -734,11 +749,19 @@ mochitest-webgl2-core:
     loopback-video: true
     max-run-time: 1800
     run-on-projects:
-        by-test-platform:
-            .*-tsan-qr/opt: ['trunk']
-            android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
-            default: built-projects
+        by-variant:
+            webgl-ipc:
+                by-test-platform:
+                    linux.*-64.*: ["trunk"]
+                    mac.*: ["trunk"]
+                    win.*: ["trunk"]
+                    default: []
+            default:
+                by-test-platform:
+                    .*-tsan-qr/opt: ['trunk']
+                    android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
+                    android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
+                    default: built-projects
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
     allow-software-gl-layers: false
     mozharness:
@@ -758,6 +781,15 @@ mochitest-webgl2-ext:
             linux.*64(-shippable)?-(qr|asan)?/opt: ['fission', 'fission-webgl-ipc', 'webgl-ipc', 'wayland']
             windows10-64-2004(-shippable)?-qr/(opt|debug): ['fission', 'fission-webgl-ipc', 'webgl-ipc']
             default: ['webgl-ipc']
+    run-on-projects:
+        by-variant:
+            webgl-ipc:
+                by-test-platform:
+                    linux.*-64.*: ["trunk"]
+                    mac.*: ["trunk"]
+                    win.*: ["trunk"]
+                    default: []
+            default: built-projects
     chunks: 4
     e10s: true
     test-manifest-loader: null  # don't load tests in the taskgraph

taskcluster/ci/test/talos.yml

@@ -559,12 +559,20 @@ talos-webgl:
             (linux1804-64|windows10-64|macosx1015-64).*-qr.*: [webgl-ipc, webrender-sw]
             default: []
     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:
+            webgl-ipc:
+                by-test-platform:
+                    linux.*-64.*: ["trunk"]
+                    mac.*: ["trunk"]
+                    win.*: ["trunk"]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32.*: []
+                    macosx1014.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macos)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     max-run-time: 2100
     mozharness:
         extra-options:

taskcluster/gecko_taskgraph/transforms/tests.py

@@ -430,16 +430,6 @@ TEST_VARIANTS = {
         # TODO: After 2021-05-01, verify this variant is still needed.
         "description": "{description} with WebGL IPC process enabled",
         "suffix": "gli",
-        "replace": {
-            "run-on-projects": {
-                "by-test-platform": {
-                    "linux.*-64.*": ["trunk"],
-                    "mac.*": ["trunk"],
-                    "win.*": ["trunk"],
-                    "default": [],
-                },
-            },
-        },
         "merge": {
             "mozharness": {
                 "extra-options": [