1 files changed, 6 insertions, 34 deletions
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index b4439a6e47..dd5d08c79d 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -58,8 +58,6 @@ mochitest-plain:
         - xorigin
         - no-fission
         - socketprocess_networking
-        - webrender-sw+no-fission
-        - webrender-sw
         - headless
         - headless+socketprocess_networking
         - http3
@@ -85,16 +83,6 @@ mochitest-plain:
                     .*(asan|ccov|wayland).*: []
                     (linux.*64|macosx.*64|windows11-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                     default: []
-            webrender-sw+no-fission:
-                by-test-platform:
-                    android-em-7.0-x86_64-qr/debug: built-projects
-                    linux.*asan.*: ['trunk']
-                    linux.*64(-shippable)?-qr/(opt|debug): ['trunk']
-                    default: []
-            webrender-sw:
-                by-test-platform:
-                    linux1804-64-qr/debug: built-projects
-                    default: []
             aab+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
@@ -142,7 +130,7 @@ mochitest-plain:
             default: 5
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory using 8GB
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory using 8GB
             default: default
     max-run-time: 5400
     allow-software-gl-layers: false
@@ -239,7 +227,6 @@ mochitest-browser-chrome:
                     linux.*64-shippable-qr/opt: ['release']
                     linux.*64(-shippable)?-qr/opt: built-projects
                     linux.*64-devedition-qr/opt: built-projects
-                    windows1.*-64.*-qr/debug: built-projects
                     default: []
             webrender-sw+a11y-checks:
                 by-test-platform:
@@ -306,7 +293,7 @@ mochitest-browser-chrome:
     # Bug 1281241: migrating to m3.large instances
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory using 8GB
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory using 8GB
             default: default
     allow-software-gl-layers: false
 
@@ -434,7 +421,7 @@ mochitest-chrome:
         chunked: true
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory otherwise using 8GB
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory otherwise using 8GB
             default: default
 
 mochitest-devtools-chrome:
@@ -447,7 +434,6 @@ mochitest-devtools-chrome:
     variants:
         - a11y-checks
         - socketprocess_networking
-        - webrender-sw
         - devtools-no-eft+no-fission
         - http3
     run-on-projects:
@@ -470,10 +456,6 @@ mochitest-devtools-chrome:
                     .*ccov.*: []
                     (linux.*64|macosx.*64|windows.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                     default: []
-            webrender-sw:
-                by-test-platform:
-                    linux.*64-qr/debug: built-projects
-                    default: []
             default:
                 by-test-platform:
                     android.*: []
@@ -501,7 +483,7 @@ mochitest-devtools-chrome:
         chunked: true
     instance-size:
         by-test-platform:
-            linux.*64-[at]san(-qr)?/opt: xlarge  # runs out of memory otherwise using 8GB
+            linux.*64-[at]san(-qr)?/opt: xlarge-noscratch  # runs out of memory otherwise using 8GB
             default: default
     # Bug 1296086: high number of intermittents observed with software GL and large instances
     allow-software-gl-layers: false
@@ -585,7 +567,7 @@ mochitest-plain-gpu:
                     - --mochitest-suite=mochitest-plain-gpu
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory otherwise using 8GB
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory otherwise using 8GB
             default: default
 
 mochitest-chrome-gpu:
@@ -625,7 +607,7 @@ mochitest-chrome-gpu:
                     - --mochitest-suite=mochitest-chrome-gpu
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory using 8GB of memory
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory using 8GB of memory
             default: default
 
 mochitest-media:
@@ -1053,8 +1035,6 @@ mochitest-remote:
     variants:
         - no-fission
         - socketprocess_networking
-        - webrender-sw+no-fission
-        - webrender-sw
     run-on-projects:
         by-variant:
             socketprocess_networking:
@@ -1063,14 +1043,6 @@ mochitest-remote:
                     .*ccov.*: []
                     (linux.*64|macosx.*64|windows1.*-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                     default: []
-            webrender-sw+no-fission:
-                by-test-platform:
-                    linux.*64-qr/debug: ['trunk']
-                    default: []
-            webrender-sw:
-                by-test-platform:
-                    linux.*64-qr/debug: ['all']
-                    default: []
             no-fission:
                 by-test-platform:
                     linux1804-64-qr/debug: ['trunk']