Bug 1751485 - s/fission-webgl-ipc/webgl-ipc+fission/ and remove e10s …

…versions of webgl tests. r=releng-reviewers,gbrown Differential Revision: https://phabricator.services.mozilla.com/D137230
dothq · Jan 28, 2022 · 257d516 · 257d516
1 parent f45abb4
commit 257d516
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 34 deletions.
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
@@ -822,9 +822,9 @@ mochitest-webgl1-core:
     variants:
         - dynamic-first-party-isolation+fission
         - fission
-        - fission-webgl-ipc
         - wayland
         - webgl-ipc
+        - webgl-ipc+fission
         - webrender-sw
         - webrender-sw+fission
     run-on-projects:
@@ -838,7 +838,7 @@ mochitest-webgl1-core:
                     .*-tsan-qr/opt: ['trunk']
                     android.*: []
                     default: built-projects
-            fission-webgl-ipc:
+            webgl-ipc+fission:
                 by-test-platform:
                     .*-ccov.*: []
                     linux.*-64.*: ["trunk"]
@@ -868,9 +868,7 @@ mochitest-webgl1-core:
                 by-test-platform:
                     android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
                     android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
-                    .*-tsan-qr/opt: []
-                    .*ccov.*: []
-                    android.*: built-projects
+                    android-hw.*aarch.*-qr/debug: ['mozilla-central']
                     linux.*: ['trunk']
                     default: []
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
@@ -895,7 +893,7 @@ mochitest-webgl1-ext:
     variants:
         - dynamic-first-party-isolation+fission
         - fission
-        - fission-webgl-ipc
+        - webgl-ipc+fission
         - wayland
         - webgl-ipc
         - webrender-sw
@@ -911,7 +909,7 @@ mochitest-webgl1-ext:
                     .*-tsan-qr/opt: ['trunk']
                     android.*: []
                     default: built-projects
-            fission-webgl-ipc:
+            webgl-ipc+fission:
                 by-test-platform:
                     .*-ccov.*: []
                     linux.*-64.*: built-projects
@@ -942,9 +940,7 @@ mochitest-webgl1-ext:
                 by-test-platform:
                     android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
                     android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
-                    .*-tsan-qr/opt: []
-                    .*ccov.*: []
-                    android.*: built-projects
+                    android-hw.*aarch.*-qr/debug: ['mozilla-central']
                     linux.*: ['trunk']
                     default: []
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
@@ -970,7 +966,7 @@ mochitest-webgl2-core:
     variants:
         - dynamic-first-party-isolation+fission
         - fission
-        - fission-webgl-ipc
+        - webgl-ipc+fission
         - wayland
         - webgl-ipc
         - webrender-sw
@@ -986,7 +982,7 @@ mochitest-webgl2-core:
                     .*-tsan-qr/opt: ['trunk']
                     android.*: []
                     default: built-projects
-            fission-webgl-ipc:
+            webgl-ipc+fission:
                 by-test-platform:
                     .*-ccov.*/.*: []
                     android.*: []
@@ -1017,9 +1013,7 @@ mochitest-webgl2-core:
                 by-test-platform:
                     android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
                     android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
-                    .*-tsan-qr/opt: []
-                    .*ccov.*: []
-                    android.*: built-projects
+                    android-hw.*aarch.*-qr/debug: ['mozilla-central']
                     linux.*: ['trunk']
                     default: []
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
@@ -1036,7 +1030,7 @@ mochitest-webgl2-ext:
     variants:
         - dynamic-first-party-isolation+fission
         - fission
-        - fission-webgl-ipc
+        - webgl-ipc+fission
         - webgl-ipc
         - webrender-sw
         - webrender-sw+fission
@@ -1051,7 +1045,7 @@ mochitest-webgl2-ext:
                 by-test-platform:
                     android.*: []
                     default: built-projects
-            fission-webgl-ipc:
+            webgl-ipc+fission:
                 by-test-platform:
                     .*ccov.*/.*: []
                     linux.*-64.*: ["trunk"]
@@ -1079,10 +1073,8 @@ mochitest-webgl2-ext:
                     default: []
             default:
                 by-test-platform:
-                    .*-tsan-qr/opt: []
-                    .*ccov.*: []
-                    android.*: built-projects
                     linux.*: ['trunk']
+                    android.*: built-projects
                     default: []
     chunks: 4
     test-manifest-loader: null  # don't load tests in the taskgraph

diff --git a/taskcluster/ci/test/variants.yml b/taskcluster/ci/test/variants.yml
@@ -102,20 +102,6 @@ fission-webrender-sw:
                 - "--setpref=gfx.webrender.software=true"
                 - "--setpref=fission.autostart=true"
 
-# TODO: After 2022-01-01, verify this variant is still needed.
-fission-webgl-ipc:
-    description: "{description} with fission and WebGL IPC process enabled"
-    contact: jgilbert
-    suffix: "fis-gli"
-    replace:
-        e10s: true
-    merge:
-        mozharness:
-            extra-options:
-                - "--setpref=fission.autostart=true"
-                - "--setpref=dom.serviceWorkers.parent_intercept=true"
-                - "--setpref=webgl.out-of-process=true"
-
 socketprocess:
     description: "{description} with socket process enabled"
     contact: kershaw