Bug 1693640 - Run devtools fission tests on opt builds on trunk (instead of shippable) r=jmaher

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

taskcluster/ci/test/mochitest.yml

@@ -295,9 +295,8 @@ mochitest-devtools-chrome:
         by-variant:
             fission:
                 by-test-platform:
-                    linux.*64(-qr)?/debug: 1
-                    linux.*64-shippable(-qr)?/opt: 1
-                    windows10-64-shippable(-qr)?/opt: 1
+                    linux.*64(-shippable)?(-qr)?/(opt|debug): 1
+                    windows10-64(-shippable)?(-qr)?/(opt|debug): 1
                     default: 2
             default: default
     max-run-time:

tools/tryselect/try_presets.yml

@@ -52,10 +52,10 @@ devtools:
         - "'node-debugger | 'node-devtools"
         - "'mozlint-eslint"
         # 'mochitest-devtools-chrome should match the "-e10s" and "-fis-e10s" flavors
-        # explicitly target "'windows10-64(-shippable)?/" to avoid duplicate jobs on -qr platforms
-        - "'mochitest-devtools-chrome | 'mochitest-chrome-1proc 'windows10-64/ | 'windows10-64-shippable/ | 'macosx1014-64"
+        # explicitly target "'windows10-64/" to avoid duplicate jobs on -qr platforms
+        - "'mochitest-devtools-chrome | 'mochitest-chrome-1proc 'windows10-64/ | 'macosx1014-64"
         # Linux is being named "linux1804" and may change over time, so use a more flexible search
-        - "'mochitest-devtools-chrome | 'mochitest-chrome-1proc 'linux '64/ | '64-shippable/"
+        - "'mochitest-devtools-chrome | 'mochitest-chrome-1proc 'linux '64/"
         - "'xpcshell-e10s 'linux '64/"
 
 devtools-linux:
@@ -65,7 +65,7 @@ devtools-linux:
     query:
         - "'node-debugger | 'node-devtools"
         - "'mozlint-eslint"
-        - "'mochitest-devtools-chrome | 'mochitest-chrome-1proc 'linux '64/ | '64-shippable/"
+        - "'mochitest-devtools-chrome | 'mochitest-chrome-1proc 'linux '64/"
         - "'xpcshell-e10s 'linux '64/"
 
 fpush-linux-android: