Bug 1724062 Test fission performance on autoland r=jmaher

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

taskcluster/ci/test/awsy.yml

@@ -43,18 +43,11 @@ awsy-tp6:
     variants: [fission]
     treeherder-symbol: SY(sy-tp6)
     run-on-projects:
-        by-variant:
-            fission:
-                by-test-platform:
-                    linux1804-64-shippable-qr/opt: [mozilla-central]
-                    windows10-64-2004-shippable-qr/opt: [mozilla-central]
-                    default: []
-            default:
-                by-test-platform:
-                    .*-devedition/.*: []  # don't run on devedition
-                    windows.*-32.*/opt: []
-                    (linux|windows10-64-2004|mac)(?!.*shippable).*/opt: []
-                    default: [integration, mozilla-central, mozilla-beta, mozilla-release]
+        by-test-platform:
+            .*-devedition/.*: []  # don't run on devedition
+            windows.*-32.*/opt: []
+            (linux|windows10-64-2004|mac)(?!.*shippable).*/opt: []
+            default: [integration, mozilla-central, mozilla-beta, mozilla-release]
     mozharness:
         extra-options:
             - --tp6

taskcluster/ci/test/browsertime-desktop.yml

@@ -136,22 +136,16 @@ browsertime-tp6-essential:
         - wikipedia
         - yahoo-mail
     run-on-projects:
-        by-variant:
-            fission:
+        by-app:
+            firefox:
                 by-test-platform:
-                    windows.*-32.*: []
-                    default: [mozilla-central]
-            default:
-                by-app:
-                    firefox:
-                        by-test-platform:
-                            linux.*shippable.*: [trunk, mozilla-beta]
-                            macosx1014-64-shippable-qr.*: [trunk]
-                            macosx1015.*shippable.*: [trunk, mozilla-beta]
-                            windows10-64.*shippable.*: [trunk, mozilla-beta]
-                            macosx1100.*shippable.*: [mozilla-central, mozilla-beta]
-                            default: []
+                    linux.*shippable.*: [trunk, mozilla-beta]
+                    macosx1014-64-shippable-qr.*: [trunk]
+                    macosx1015.*shippable.*: [trunk, mozilla-beta]
+                    windows10-64.*shippable.*: [trunk, mozilla-beta]
+                    macosx1100.*shippable.*: [mozilla-central, mozilla-beta]
                     default: []
+            default: []
     variants:
         by-app:
             firefox:

taskcluster/ci/test/talos.yml

@@ -26,35 +26,21 @@ job-defaults:
                     - talos/linux_config.py
     test-manifest-loader: null  # don't load tests in the taskgraph
     run-on-projects:
-        by-variant:
-            fission:
-                by-test-name:
-                    talos-.*-profiling-fis: []
-                    talos-tabswitch-fis:
-                        by-test-platform:
-                            macosx1014.*: []
-                            (linux1804-64|windows10-64|macosx.*)-shippable-qr/opt: [mozilla-central]
-                            default: []
-                    default:
-                        by-test-platform:
-                            (linux1804-64|windows10-64|macosx.*)-shippable-qr/opt: [mozilla-central]
-                            default: []
+        by-test-name:
+            talos-.*-profiling: []
+            talos-tabswitch:
+                by-test-platform:
+                    windows.*-32.*: []
+                    macosx1014.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macos)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
             default:
-                by-test-name:
-                    talos-.*-profiling: []
-                    talos-tabswitch:
-                        by-test-platform:
-                            windows.*-32.*: []
-                            macosx1014.*: []
-                            (linux|windows10-64|macos)(?!.*shippable).*: []
-                            (linux|windows10-64|macos)(?!.*-qr).*: []
-                            default: [mozilla-beta, trunk]
-                    default:
-                        by-test-platform:
-                            windows.*-32.*: []
-                            (linux|windows10-64|macos)(?!.*shippable).*: []
-                            (linux|windows10-64|macosx1015)(?!.*-qr).*: []
-                            default: [mozilla-beta, trunk]
+                by-test-platform:
+                    windows.*-32.*: []
+                    (linux|windows10-64|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macosx1015)(?!.*-qr).*: []
+                    default: [mozilla-beta, trunk]
     python-3: true
 
 talos-bcv:
@@ -66,21 +52,15 @@ talos-bcv:
             (linux1804-64|windows10-64|macosx1015-64).*-qr.*: [fission, webrender-sw]
             default: [fission]
     run-on-projects:
-        by-variant:
-            fission:
-                by-test-platform:
-                    (linux1804-64|windows10-64|macosx.*)-shippable-qr/opt: [mozilla-central]
+        by-test-platform:
+            (linux|windows10-64|macosx1015-64)(?:shippable-qr|-qr)/.*:
+                by-variant:
+                    webrender-sw: [trunk]
                     default: []
-            default:
-                by-test-platform:
-                    (linux|windows10-64|macosx1015-64)(?:shippable-qr|-qr)/.*:
-                        by-variant:
-                            webrender-sw: [trunk]
-                            default: []
-                    windows.*-32.*: []
-                    (linux|windows10-64|macos)(?!.*shippable).*: []
-                    (linux|windows10-64|macos)(?!.*-qr).*: []
-                    default: [mozilla-beta, trunk]
+            windows.*-32.*: []
+            (linux|windows10-64|macos)(?!.*shippable).*: []
+            (linux|windows10-64|macos)(?!.*-qr).*: []
+            default: [mozilla-beta, trunk]
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -135,7 +115,7 @@ talos-damp:
         by-variant:
             fission:
                 by-test-platform:
-                    (linux1804-64|windows10-64)-shippable-qr/opt: [mozilla-central]
+                    (linux1804-64|windows10-64)-shippable-qr/opt: [mozilla-central, autoland]
                     # Bug 1657864 - Disabled on macos for high frequency intermittents
                     default: []
             default:
@@ -289,7 +269,7 @@ talos-g4:
         by-variant:
             fission:
                 by-test-platform:
-                    (linux1804-64|windows10-64|macosx)-shippable-qr/opt: [mozilla-central]
+                    (linux1804-64|windows10-64|macosx)-shippable-qr/opt: [mozilla-central, autoland]
                     default: []
             default:
                 by-test-platform:
@@ -433,17 +413,11 @@ talos-sessionrestore-many-windows:
             (linux1804-64|windows|macosx).*-qr.*: [fission, webrender-sw]
             default: []
     run-on-projects:
-        by-variant:
-            fission:
-                by-test-platform:
-                    (linux1804-64|windows10-64|macosx.*)-shippable-qr/opt: [mozilla-central]
-                    default: []
-            default:
-                by-test-platform:
-                    windows.*-32.*/opt: []
-                    (linux|windows10-64|macos)(?!.*shippable).*: []
-                    (linux|windows10-64|macos)(?!.*-qr).*: []
-                    default: [mozilla-central]
+        by-test-platform:
+            windows.*-32.*/opt: []
+            (linux|windows10-64|macos)(?!.*shippable).*: []
+            (linux|windows10-64|macos)(?!.*-qr).*: []
+            default: [mozilla-central, autoland]
     max-run-time: 1500
     mozharness:
         extra-options:
@@ -628,16 +602,10 @@ talos-xperf:
             (linux1804-64|windows|macos).*-qr.*: [fission, webrender-sw]
             default: []
     run-on-projects:
-        by-variant:
-            fission:
-                by-test-platform:
-                    (linux1804-64|windows10-64|macosx1015-64)-shippable-qr/opt: [mozilla-central]
-                    default: []
-            default:
-                by-test-platform:
-                    windows.*-32-shippable(?:-qr)?/.*: []
-                    windows10-64-shippable-qr/.*: [mozilla-beta, trunk]
-                    default: []
+        by-test-platform:
+            windows.*-32-shippable(?:-qr)?/.*: []
+            windows10-64-shippable-qr/.*: [mozilla-beta, trunk]
+            default: []
     mozharness:
         extra-options:
             - --suite=xperf

testing/perfdocs/generated/raptor.rst

@@ -2313,7 +2313,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-amazon-e10s: None
             * browsertime-tp6-essential-chromium-amazon-e10s: None
             * browsertime-tp6-essential-firefox-amazon-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-amazon-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-amazon-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-amazon-e10s: None
             * browsertime-tp6-live-chromium-amazon-e10s: None
             * browsertime-tp6-live-firefox-amazon-e10s: None
@@ -2324,7 +2324,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-amazon-e10s: None
             * browsertime-tp6-essential-chromium-amazon-e10s: None
             * browsertime-tp6-essential-firefox-amazon-e10s: trunk
-            * browsertime-tp6-essential-firefox-amazon-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-amazon-fis-e10s: trunk
             * browsertime-tp6-live-chrome-amazon-e10s: None
             * browsertime-tp6-live-chromium-amazon-e10s: None
             * browsertime-tp6-live-firefox-amazon-e10s: None
@@ -2333,7 +2333,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-amazon-e10s: None
             * browsertime-tp6-essential-chromium-amazon-e10s: None
             * browsertime-tp6-essential-firefox-amazon-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-amazon-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-amazon-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-amazon-e10s: None
             * browsertime-tp6-live-chromium-amazon-e10s: None
             * browsertime-tp6-live-firefox-amazon-e10s: None
@@ -2362,7 +2362,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-amazon-e10s: None
             * browsertime-tp6-essential-chromium-amazon-e10s: None
             * browsertime-tp6-essential-firefox-amazon-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-amazon-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-amazon-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-amazon-e10s: None
             * browsertime-tp6-live-chromium-amazon-e10s: None
             * browsertime-tp6-live-firefox-amazon-e10s: None
@@ -2461,7 +2461,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-bing-search-e10s: None
             * browsertime-tp6-essential-chromium-bing-search-e10s: None
             * browsertime-tp6-essential-firefox-bing-search-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-bing-search-e10s: None
             * browsertime-tp6-live-chromium-bing-search-e10s: None
             * browsertime-tp6-live-firefox-bing-search-e10s: None
@@ -2470,7 +2470,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-bing-search-e10s: None
             * browsertime-tp6-essential-chromium-bing-search-e10s: None
             * browsertime-tp6-essential-firefox-bing-search-e10s: trunk
-            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: trunk
             * browsertime-tp6-live-chrome-bing-search-e10s: None
             * browsertime-tp6-live-chromium-bing-search-e10s: None
             * browsertime-tp6-live-firefox-bing-search-e10s: None
@@ -2479,7 +2479,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-bing-search-e10s: None
             * browsertime-tp6-essential-chromium-bing-search-e10s: None
             * browsertime-tp6-essential-firefox-bing-search-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-bing-search-e10s: None
             * browsertime-tp6-live-chromium-bing-search-e10s: None
             * browsertime-tp6-live-firefox-bing-search-e10s: None
@@ -2506,7 +2506,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-bing-search-e10s: None
             * browsertime-tp6-essential-chromium-bing-search-e10s: None
             * browsertime-tp6-essential-firefox-bing-search-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-bing-search-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-bing-search-e10s: None
             * browsertime-tp6-live-chromium-bing-search-e10s: None
             * browsertime-tp6-live-firefox-bing-search-e10s: None
@@ -2604,21 +2604,21 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None
       * test-macosx1014-64-shippable-qr/opt
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None
       * test-macosx1015-64-shippable-qr/opt
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None
       * test-windows10-32-qr/opt
@@ -2641,7 +2641,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None
 
@@ -2964,7 +2964,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-fandom-e10s: None
             * browsertime-tp6-essential-chromium-fandom-e10s: None
             * browsertime-tp6-essential-firefox-fandom-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-fandom-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-fandom-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-fandom-e10s: None
             * browsertime-tp6-live-chromium-fandom-e10s: None
             * browsertime-tp6-live-firefox-fandom-e10s: None
@@ -2973,7 +2973,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-fandom-e10s: None
             * browsertime-tp6-essential-chromium-fandom-e10s: None
             * browsertime-tp6-essential-firefox-fandom-e10s: trunk
-            * browsertime-tp6-essential-firefox-fandom-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-fandom-fis-e10s: trunk
             * browsertime-tp6-live-chrome-fandom-e10s: None
             * browsertime-tp6-live-chromium-fandom-e10s: None
             * browsertime-tp6-live-firefox-fandom-e10s: None
@@ -2982,7 +2982,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-fandom-e10s: None
             * browsertime-tp6-essential-chromium-fandom-e10s: None
             * browsertime-tp6-essential-firefox-fandom-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-fandom-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-fandom-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-fandom-e10s: None
             * browsertime-tp6-live-chromium-fandom-e10s: None
             * browsertime-tp6-live-firefox-fandom-e10s: None
@@ -3009,7 +3009,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-fandom-e10s: None
             * browsertime-tp6-essential-chromium-fandom-e10s: None
             * browsertime-tp6-essential-firefox-fandom-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-fandom-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-fandom-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-fandom-e10s: None
             * browsertime-tp6-live-chromium-fandom-e10s: None
             * browsertime-tp6-live-firefox-fandom-e10s: None
@@ -3359,7 +3359,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-google-slides-e10s: None
             * browsertime-tp6-essential-chromium-google-slides-e10s: None
             * browsertime-tp6-essential-firefox-google-slides-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-google-slides-e10s: None
             * browsertime-tp6-live-chromium-google-slides-e10s: None
             * browsertime-tp6-live-firefox-google-slides-e10s: None
@@ -3368,7 +3368,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-google-slides-e10s: None
             * browsertime-tp6-essential-chromium-google-slides-e10s: None
             * browsertime-tp6-essential-firefox-google-slides-e10s: trunk
-            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: trunk
             * browsertime-tp6-live-chrome-google-slides-e10s: None
             * browsertime-tp6-live-chromium-google-slides-e10s: None
             * browsertime-tp6-live-firefox-google-slides-e10s: None
@@ -3377,7 +3377,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-google-slides-e10s: None
             * browsertime-tp6-essential-chromium-google-slides-e10s: None
             * browsertime-tp6-essential-firefox-google-slides-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-google-slides-e10s: None
             * browsertime-tp6-live-chromium-google-slides-e10s: None
             * browsertime-tp6-live-firefox-google-slides-e10s: None
@@ -3404,7 +3404,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-google-slides-e10s: None
             * browsertime-tp6-essential-chromium-google-slides-e10s: None
             * browsertime-tp6-essential-firefox-google-slides-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-google-slides-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-google-slides-e10s: None
             * browsertime-tp6-live-chromium-google-slides-e10s: None
             * browsertime-tp6-live-firefox-google-slides-e10s: None
@@ -3611,7 +3611,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-instagram-e10s: None
             * browsertime-tp6-essential-chromium-instagram-e10s: None
             * browsertime-tp6-essential-firefox-instagram-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-instagram-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-instagram-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-instagram-e10s: None
             * browsertime-tp6-live-chromium-instagram-e10s: None
             * browsertime-tp6-live-firefox-instagram-e10s: None
@@ -3620,7 +3620,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-instagram-e10s: None
             * browsertime-tp6-essential-chromium-instagram-e10s: None
             * browsertime-tp6-essential-firefox-instagram-e10s: trunk
-            * browsertime-tp6-essential-firefox-instagram-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-instagram-fis-e10s: trunk
             * browsertime-tp6-live-chrome-instagram-e10s: None
             * browsertime-tp6-live-chromium-instagram-e10s: None
             * browsertime-tp6-live-firefox-instagram-e10s: None
@@ -3629,7 +3629,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-instagram-e10s: None
             * browsertime-tp6-essential-chromium-instagram-e10s: None
             * browsertime-tp6-essential-firefox-instagram-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-instagram-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-instagram-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-instagram-e10s: None
             * browsertime-tp6-live-chromium-instagram-e10s: None
             * browsertime-tp6-live-firefox-instagram-e10s: None
@@ -3656,7 +3656,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-instagram-e10s: None
             * browsertime-tp6-essential-chromium-instagram-e10s: None
             * browsertime-tp6-essential-firefox-instagram-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-instagram-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-instagram-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-instagram-e10s: None
             * browsertime-tp6-live-chromium-instagram-e10s: None
             * browsertime-tp6-live-firefox-instagram-e10s: None
@@ -4569,7 +4569,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-twitter-e10s: None
             * browsertime-tp6-essential-chromium-twitter-e10s: None
             * browsertime-tp6-essential-firefox-twitter-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-twitter-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-twitter-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-twitter-e10s: None
             * browsertime-tp6-live-chromium-twitter-e10s: None
             * browsertime-tp6-live-firefox-twitter-e10s: None
@@ -4578,7 +4578,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-twitter-e10s: None
             * browsertime-tp6-essential-chromium-twitter-e10s: None
             * browsertime-tp6-essential-firefox-twitter-e10s: trunk
-            * browsertime-tp6-essential-firefox-twitter-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-twitter-fis-e10s: trunk
             * browsertime-tp6-live-chrome-twitter-e10s: None
             * browsertime-tp6-live-chromium-twitter-e10s: None
             * browsertime-tp6-live-firefox-twitter-e10s: None
@@ -4587,7 +4587,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-twitter-e10s: None
             * browsertime-tp6-essential-chromium-twitter-e10s: None
             * browsertime-tp6-essential-firefox-twitter-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-twitter-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-twitter-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-twitter-e10s: None
             * browsertime-tp6-live-chromium-twitter-e10s: None
             * browsertime-tp6-live-firefox-twitter-e10s: None
@@ -4614,7 +4614,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-twitter-e10s: None
             * browsertime-tp6-essential-chromium-twitter-e10s: None
             * browsertime-tp6-essential-firefox-twitter-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-twitter-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-twitter-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-twitter-e10s: None
             * browsertime-tp6-live-chromium-twitter-e10s: None
             * browsertime-tp6-live-firefox-twitter-e10s: None
@@ -4712,7 +4712,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-wikipedia-e10s: None
             * browsertime-tp6-essential-chromium-wikipedia-e10s: None
             * browsertime-tp6-essential-firefox-wikipedia-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-wikipedia-e10s: None
             * browsertime-tp6-live-chromium-wikipedia-e10s: None
             * browsertime-tp6-live-firefox-wikipedia-e10s: None
@@ -4721,7 +4721,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-wikipedia-e10s: None
             * browsertime-tp6-essential-chromium-wikipedia-e10s: None
             * browsertime-tp6-essential-firefox-wikipedia-e10s: trunk
-            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: trunk
             * browsertime-tp6-live-chrome-wikipedia-e10s: None
             * browsertime-tp6-live-chromium-wikipedia-e10s: None
             * browsertime-tp6-live-firefox-wikipedia-e10s: None
@@ -4730,7 +4730,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-wikipedia-e10s: None
             * browsertime-tp6-essential-chromium-wikipedia-e10s: None
             * browsertime-tp6-essential-firefox-wikipedia-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-wikipedia-e10s: None
             * browsertime-tp6-live-chromium-wikipedia-e10s: None
             * browsertime-tp6-live-firefox-wikipedia-e10s: None
@@ -4757,7 +4757,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-wikipedia-e10s: None
             * browsertime-tp6-essential-chromium-wikipedia-e10s: None
             * browsertime-tp6-essential-firefox-wikipedia-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-wikipedia-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-wikipedia-e10s: None
             * browsertime-tp6-live-chromium-wikipedia-e10s: None
             * browsertime-tp6-live-firefox-wikipedia-e10s: None
@@ -4796,7 +4796,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-essential-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-essential-firefox-yahoo-mail-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-live-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-live-firefox-yahoo-mail-e10s: None
@@ -4805,7 +4805,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-essential-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-essential-firefox-yahoo-mail-e10s: trunk
-            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: trunk
             * browsertime-tp6-live-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-live-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-live-firefox-yahoo-mail-e10s: None
@@ -4814,7 +4814,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-essential-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-essential-firefox-yahoo-mail-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-live-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-live-firefox-yahoo-mail-e10s: None
@@ -4841,7 +4841,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
             * browsertime-tp6-essential-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-essential-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-essential-firefox-yahoo-mail-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-yahoo-mail-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-chrome-yahoo-mail-e10s: None
             * browsertime-tp6-live-chromium-yahoo-mail-e10s: None
             * browsertime-tp6-live-firefox-yahoo-mail-e10s: None
@@ -4981,21 +4981,21 @@ A set of test pages that are run as live sites instead of recorded versions. The
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None
       * test-macosx1014-64-shippable-qr/opt
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None
       * test-macosx1015-64-shippable-qr/opt
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None
       * test-windows10-32-qr/opt
@@ -5018,7 +5018,7 @@ A set of test pages that are run as live sites instead of recorded versions. The
             * browsertime-tp6-essential-chrome-cnn-e10s: None
             * browsertime-tp6-essential-chromium-cnn-e10s: None
             * browsertime-tp6-essential-firefox-cnn-e10s: mozilla-beta, trunk
-            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-central
+            * browsertime-tp6-essential-firefox-cnn-fis-e10s: mozilla-beta, trunk
             * browsertime-tp6-live-sheriffed-firefox-cnn-e10s: None
             * browsertime-tp6-live-sheriffed-firefox-cnn-fis-e10s: None