Bug 1750804 - turn off e10s talos-webgl, run only on fission. r=perftest-reviewers,AlexandruIonescu

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

taskcluster/ci/config.yml

@@ -102,7 +102,6 @@ treeherder:
         'remote': 'Remote debugging protocol tests'
         'T': 'Talos performance tests'
         'T-fis': 'Talos performance tests with fission enabled'
-        'T-fis-swr': 'Talos performance tests with fission enabled and software webrender'
         'T-gli': 'Talos performance tests with WebGL over IPC'
         'T-gli-fis': 'Talos performance tests with WebGL over IPC with fission enabled'
         'T-Prof': 'Talos performance tests on Firefox with Gecko Profiling'
@@ -110,6 +109,7 @@ treeherder:
         'T-Prof-gli': 'Talos performance tests with WebGL over IPC and Gecko Profiling'
         'T-Prof-gli-fis': 'Talos performance tests with WebGL over IPC and Gecko Profiling and fission enabled'
         'T-swr': 'Talos performance tests with software webrender enabled'
+        'T-swr-fis': 'Talos performance tests with software webrender enabled'
         'tt': 'Telemetry tests'
         'tt-fis': 'Telemetry tests with fission enabled'
         'SY': 'Are we slim yet tests by TaskCluster'

taskcluster/ci/test/talos.yml

@@ -31,11 +31,11 @@ talos-bcv:
     treeherder-symbol: T(bcv)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|macosx1015|windows10)-64-shippable-qr/opt: [mozilla-beta, trunk]
                     (windows10-64|macosx1015-64).*-qr.*: [trunk]
@@ -71,7 +71,7 @@ talos-chrome:
     treeherder-symbol: T(c)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-test-platform:
@@ -105,11 +105,11 @@ talos-damp:
     max-run-time: 5400
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx1015)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -210,11 +210,11 @@ talos-g1:
     treeherder-symbol: T(g1)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -255,11 +255,11 @@ talos-g3:
     treeherder-symbol: T(g3)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -294,11 +294,11 @@ talos-g4:
     treeherder-symbol: T(g4)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx1015)-64-shippable-qr/opt: [mozilla-beta, trunk]
                     default: []
@@ -342,11 +342,11 @@ talos-g5:
             - --suite=g5
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -456,11 +456,11 @@ talos-other:
     treeherder-symbol: T(o)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -495,11 +495,11 @@ talos-sessionrestore-many-windows:
     treeherder-symbol: T(smw)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-central, autoland]
                     default: []
@@ -534,11 +534,11 @@ talos-perf-reftest:
     treeherder-symbol: T(p)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -604,11 +604,11 @@ talos-svgr:
     treeherder-symbol: T(s)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -643,11 +643,11 @@ talos-tp5o:
     treeherder-symbol: T(tp)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -682,11 +682,11 @@ talos-tabswitch:
     treeherder-symbol: T(tabswitch)
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-variant:
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx.*)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -721,20 +721,16 @@ talos-webgl:
     treeherder-symbol: T(webgl)
     variants:
         - fission
-        - fission-webrender-sw
-        - webgl-ipc
+        - webrender-sw+fission
         - webgl-ipc+fission
+    run-without-variant: false
     run-on-projects:
         by-variant:
-            webgl-ipc:
-                by-test-platform:
-                    (linux1804|windows10|macosx1015)-64.*: [trunk]
-                    default: []
             webgl-ipc+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx1015)-64.*: [trunk]
                     default: []
-            fission-webrender-sw:
+            webrender-sw+fission:
                 by-test-platform:
                     (linux1804|windows10|macosx1015)-64-shippable-qr.*: [mozilla-beta, trunk]
                     default: []
@@ -760,7 +756,6 @@ talos-webgl-profiling:
     treeherder-symbol: T-Prof(webgl)
     tier: 2
     variants:
-        - webgl-ipc
         - webgl-ipc+fission
     run-on-projects: []
     max-run-time: 1800
@@ -781,7 +776,7 @@ talos-xperf:
             windows10-64.*: true
     variants:
         - fission
-        - fission-webrender-sw
+        - webrender-sw+fission
     run-without-variant: false
     run-on-projects:
         by-test-platform:

taskcluster/ci/test/variants.yml

@@ -91,17 +91,6 @@ fission-xorigin:
                 - "--setpref=fission.autostart=true"
                 - "--enable-xorigin-tests"
 
-fission-webrender-sw:
-    description: "{description} with software webrender enabled"
-    contact: aosmond
-    suffix: "fis-swr"
-    merge:
-        webrender: true
-        mozharness:
-            extra-options:
-                - "--setpref=gfx.webrender.software=true"
-                - "--setpref=fission.autostart=true"
-
 socketprocess:
     description: "{description} with socket process enabled"
     contact: kershaw