Bug 1564242 Split raptor.yml taskcluster test configs into smaller files: part 1 (fenix) r=perftest-reviewers,rwood
authoralexandru.ionescu <alexandru.ionescu@softvision.ro>
Wed, 14 Aug 2019 13:35:17 +0000
changeset 488229 9cd8a0091ff2f85659591ddc67c55db127d30430
parent 488228 adba66fff09bc3d77f7f9d865b78095888ba626b
child 488230 175608dbc5018b3563b85908578cc0ca038f7acb
push id113904
push userncsoregi@mozilla.com
push dateThu, 15 Aug 2019 19:41:00 +0000
treeherdermozilla-inbound@b283a7ef186c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersperftest-reviewers, rwood
bugs1564242
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1564242 Split raptor.yml taskcluster test configs into smaller files: part 1 (fenix) r=perftest-reviewers,rwood Differential Revision: https://phabricator.services.mozilla.com/D41950
taskcluster/ci/test/kind.yml
taskcluster/ci/test/raptor-chromium.yml
taskcluster/ci/test/raptor-fenix.yml
taskcluster/ci/test/raptor.yml
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -29,16 +29,17 @@ jobs-from:
     - awsy.yml
     - compiled.yml
     - firefox-ui.yml
     - marionette.yml
     - misc.yml
     - mochitest.yml
     - raptor.yml
     - raptor-chromium.yml
+    - raptor-fenix.yml
     - reftest.yml
     - talos.yml
     - web-platform.yml
     - xpcshell.yml
 
 job-defaults:
     attributes:
         retrigger: true
--- a/taskcluster/ci/test/raptor-chromium.yml
+++ b/taskcluster/ci/test/raptor-chromium.yml
@@ -4,20 +4,17 @@
 ---
 job-defaults:
     max-run-time:
         by-test-platform:
             .*-qr/.*: 2400
             .*-ux/.*: 2400
             default: 1800
     suite: raptor
-    workdir:
-        by-test-platform:
-            android-hw.*: /builds/worker
-            default: /home/cltbld
+    workdir: /home/cltbld
     run-on-projects: ['try', 'mozilla-central']
     tier: 2
     virtualization:
         by-test-platform:
             windows10-64-ccov/.*: virtual
             default: hardware
     mozharness:
         script: raptor_script.py
@@ -26,18 +23,16 @@ job-defaults:
                 macosx.*:
                     - raptor/mac_config.py
                 windows.*:
                     - raptor/windows_config.py
                 windows10-64-ccov/debug:
                     - raptor/windows_vm_config.py
                 linux64-ccov/opt:
                     - raptor/linux64_config_taskcluster.py
-                android-hw.*:
-                    - raptor/android_hw_config.py
                 default:
                     - raptor/linux_config.py
     fetches:
         fetch:
             by-test-platform:
                 win.*64.*:
                     - win64-chromium
                 win.*32.*:
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/test/raptor-fenix.yml
@@ -0,0 +1,599 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+job-defaults:
+    max-run-time: 1800
+    suite: raptor
+    workdir: /builds/worker
+    run-on-projects:
+        by-test-platform:
+            android-hw-.*/opt: []
+            android-hw-.*/pgo: ['trunk', 'mozilla-beta']
+    tier:
+        by-test-platform:
+            android-hw-g5.*: 2
+            default: 1
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    e10s: true
+    virtualization: hardware
+    mozharness:
+        script: raptor_script.py
+        config:
+            - raptor/android_hw_config.py
+
+raptor-tp6m-1-fenix:
+    description: "Raptor tp6m-1 on Fenix"
+    try-name: raptor-tp6m-1-fenix
+    treeherder-symbol: Rap-fenix(tp6m-1)
+    run-on-projects: []
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-1
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-2-fenix:
+    description: "Raptor tp6m-2 on Fenix"
+    try-name: raptor-tp6m-2-fenix
+    treeherder-symbol: Rap-fenix(tp6m-2)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-2
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-3-fenix:
+    description: "Raptor tp6m-3 on Fenix"
+    try-name: raptor-tp6m-3-fenix
+    treeherder-symbol: Rap-fenix(tp6m-3)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-3
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-4-fenix:
+    description: "Raptor tp6m-4 on Fenix"
+    try-name: raptor-tp6m-4-fenix
+    treeherder-symbol: Rap-fenix(tp6m-4)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-4
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-5-fenix:
+    description: "Raptor tp6m-5 on Fenix"
+    try-name: raptor-tp6m-5-fenix
+    treeherder-symbol: Rap-fenix(tp6m-5)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-5
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-6-fenix:
+    description: "Raptor tp6m-6 on Fenix"
+    try-name: raptor-tp6m-6-fenix
+    treeherder-symbol: Rap-fenix(tp6m-6)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-6
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-7-fenix:
+    description: "Raptor tp6m-7 on Fenix"
+    try-name: raptor-tp6m-7-fenix
+    treeherder-symbol: Rap-fenix(tp6m-7)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-7
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-8-fenix:
+    description: "Raptor tp6m-8 on Fenix"
+    try-name: raptor-tp6m-8-fenix
+    treeherder-symbol: Rap-fenix(tp6m-8)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-8
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-9-fenix:
+    description: "Raptor tp6m-9 on Fenix"
+    try-name: raptor-tp6m-9-fenix
+    treeherder-symbol: Rap-fenix(tp6m-9)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-9
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-10-fenix:
+    description: "Raptor tp6m-10 on Fenix"
+    try-name: raptor-tp6m-10-fenix
+    treeherder-symbol: Rap-fenix(tp6m-10)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-10
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-1-fenix-cold:
+    description: "Raptor tp6m-1 cold page-load on Fenix"
+    try-name: raptor-tp6m-1-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-1)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-1
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-2-fenix-cold:
+    description: "Raptor tp6m-2 cold page-load on Fenix"
+    try-name: raptor-tp6m-2-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-2)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-2
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-3-fenix-cold:
+    description: "Raptor tp6m-3 cold page-load on Fenix"
+    try-name: raptor-tp6m-3-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-3)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-3
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-4-fenix-cold:
+    description: "Raptor tp6m-4 cold page-load on Fenix"
+    try-name: raptor-tp6m-4-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-4)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-4
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-5-fenix-cold:
+    description: "Raptor tp6m-5 cold page-load on Fenix"
+    try-name: raptor-tp6m-5-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-5)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-5
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-6-fenix-cold:
+    description: "Raptor tp6m-6 cold page-load on Fenix"
+    try-name: raptor-tp6m-6-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-6)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-6
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-7-fenix-cold:
+    description: "Raptor tp6m-7 cold page-load on Fenix"
+    try-name: raptor-tp6m-7-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-7)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-7
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-8-fenix-cold:
+    description: "Raptor tp6m-8 cold page-load on Fenix"
+    try-name: raptor-tp6m-8-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-8)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-8
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-9-fenix-cold:
+    description: "Raptor tp6m-9 cold page-load on Fenix"
+    try-name: raptor-tp6m-9-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-9)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-9
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-10-fenix-cold:
+    description: "Raptor tp6m-10 cold page-load on Fenix"
+    try-name: raptor-tp6m-10-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-10)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-10
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-11-fenix-cold:
+    description: "Raptor tp6m-11 cold page-load on Fenix"
+    try-name: raptor-tp6m-11-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-11)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-11
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-12-fenix-cold:
+    description: "Raptor tp6m-12 cold page-load on Fenix"
+    try-name: raptor-tp6m-12-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-12)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-12
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-13-fenix-cold:
+    description: "Raptor tp6m-13 cold page-load on Fenix"
+    try-name: raptor-tp6m-13-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-13)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-13
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-14-fenix-cold:
+    description: "Raptor tp6m-14 cold page-load on Fenix"
+    try-name: raptor-tp6m-14-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-14)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-14
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-15-fenix-cold:
+    description: "Raptor tp6m-15 cold page-load on Fenix"
+    try-name: raptor-tp6m-15-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-15)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-15
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-16-fenix-cold:
+    description: "Raptor tp6m-16 cold page-load on Fenix"
+    try-name: raptor-tp6m-16-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-16)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-16
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-17-fenix-cold:
+    description: "Raptor tp6m-17 cold page-load on Fenix"
+    try-name: raptor-tp6m-17-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-17)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-17
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-18-fenix-cold:
+    description: "Raptor tp6m-18 cold page-load on Fenix"
+    try-name: raptor-tp6m-18-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-18)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-18
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-19-fenix-cold:
+    description: "Raptor tp6m-19 cold page-load on Fenix"
+    try-name: raptor-tp6m-19-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-19)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-19
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-20-fenix-cold:
+    description: "Raptor tp6m-20 cold page-load on Fenix"
+    try-name: raptor-tp6m-20-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-20)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-20
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-21-fenix-cold:
+    description: "Raptor tp6m-21 cold page-load on Fenix"
+    try-name: raptor-tp6m-21-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-21)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-21
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-22-fenix-cold:
+    description: "Raptor tp6m-22 cold page-load on Fenix"
+    try-name: raptor-tp6m-22-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-22)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-22
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-23-fenix-cold:
+    description: "Raptor tp6m-23 cold page-load on Fenix"
+    try-name: raptor-tp6m-23-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-23)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-23
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-24-fenix-cold:
+    description: "Raptor tp6m-24 cold page-load on Fenix"
+    try-name: raptor-tp6m-24-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-24)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-24
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-25-fenix-cold:
+    description: "Raptor tp6m-25 cold page-load on Fenix"
+    try-name: raptor-tp6m-25-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-25)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-25
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-26-fenix-cold:
+    description: "Raptor tp6m-26 cold page-load on Fenix"
+    try-name: raptor-tp6m-26-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-26)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-26
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-tp6m-27-fenix-cold:
+    description: "Raptor tp6m-27 cold page-load on Fenix"
+    try-name: raptor-tp6m-27-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-27)
+    run-on-projects: []
+    e10s: true
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-27
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-scn-power-idle-fenix:
+    description: "Raptor idle-browser power-usage test on Fenix"
+    try-name: raptor-scn-power-idle-fenix
+    treeherder-symbol: Rap-fenix(idl-p)
+    run-on-projects: []
+    e10s: true
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-scn-power-idle-bg-fenix:
+    description: "Raptor idle-browser (backgrounded) power-usage measurement on Fenix"
+    try-name: raptor-scn-power-idle-bg-fenix
+    treeherder-symbol: Rap-fenix(idlbg-p)
+    run-on-projects: []
+    e10s: true
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle-bg
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-youtube-playback-fenix:
+    description: "Raptor YouTube Playback on Fenix"
+    try-name: raptor-youtube-playback-fenix
+    treeherder-symbol: Rap-fenix(ytp)
+    run-on-projects: []
+    e10s: true
+    max-run-time: 3600
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-youtube-playback
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+            # Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases
+            # - --test-url-params is dynamically added from setup_raptor transform depending
+            # on platform and project
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -281,38 +281,16 @@ raptor-tp6m-1-geckoview:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-1
             - --app=geckoview
             - --binary=org.mozilla.geckoview_example
             - --activity=org.mozilla.geckoview_example.GeckoViewActivity
 
-raptor-tp6m-1-fenix:
-    description: "Raptor tp6m-1 on Fenix"
-    try-name: raptor-tp6m-1-fenix
-    treeherder-symbol: Rap-fenix(tp6m-1)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-1
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-1-refbrow:
     description: "Raptor tp6m-1 on the reference browser"
     treeherder-symbol: Rap-refbrow(tp6m-1)
     run-on-projects: []
     target:
         by-test-platform:
             android-hw.*-aarch64.*/.*:
                 index: project.mobile.reference-browser.v2.raptor.latest.aarch64
@@ -323,38 +301,16 @@ raptor-tp6m-1-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-1
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-2-fenix:
-    description: "Raptor tp6m-2 on Fenix"
-    try-name: raptor-tp6m-2-fenix
-    treeherder-symbol: Rap-fenix(tp6m-2)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-2
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-2-geckoview:
     description: "Raptor tp6m-2 on GeckoView"
     try-name: raptor-tp6m-2-geckoview
     treeherder-symbol: Rap(tp6m-2)
     target: geckoview_example.apk
     run-on-projects: ['mozilla-central']
     tier: 2
     mozharness:
@@ -412,38 +368,16 @@ raptor-tp6m-3-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-3
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-3-fenix:
-    description: "Raptor tp6m-3 on Fenix"
-    try-name: raptor-tp6m-3-fenix
-    treeherder-symbol: Rap-fenix(tp6m-3)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-3
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-4-geckoview:
     description: "Raptor tp6m-4 on GeckoView"
     try-name: raptor-tp6m-4-geckoview
     treeherder-symbol: Rap(tp6m-4)
     target: geckoview_example.apk
     run-on-projects: ['mozilla-central']
     tier: 2
     mozharness:
@@ -467,38 +401,16 @@ raptor-tp6m-4-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-4
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-4-fenix:
-    description: "Raptor tp6m-4 on Fenix"
-    try-name: raptor-tp6m-4-fenix
-    treeherder-symbol: Rap-fenix(tp6m-4)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-4
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-5-geckoview:
     description: "Raptor tp6m-5 on GeckoView"
     try-name: raptor-tp6m-5-geckoview
     treeherder-symbol: Rap(tp6m-5)
     run-on-projects: ['mozilla-central']
     target: geckoview_example.apk
     tier: 2
     mozharness:
@@ -523,38 +435,16 @@ raptor-tp6m-5-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-5
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-5-fenix:
-    description: "Raptor tp6m-5 on Fenix"
-    try-name: raptor-tp6m-5-fenix
-    treeherder-symbol: Rap-fenix(tp6m-5)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-5
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-6-geckoview:
     description: "Raptor tp6m-6 on GeckoView"
     try-name: raptor-tp6m-6-geckoview
     treeherder-symbol: Rap(tp6m-6)
     run-on-projects: ['mozilla-central']
     target: geckoview_example.apk
     tier: 2
     mozharness:
@@ -578,38 +468,16 @@ raptor-tp6m-6-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-6
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-6-fenix:
-    description: "Raptor tp6m-6 on Fenix"
-    try-name: raptor-tp6m-6-fenix
-    treeherder-symbol: Rap-fenix(tp6m-6)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-6
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-7-geckoview:
     description: "Raptor tp6m-7 on GeckoView"
     try-name: raptor-tp6m-7-geckoview
     treeherder-symbol: Rap(tp6m-7)
     run-on-projects: ['mozilla-central']
     target: geckoview_example.apk
     tier: 2
     mozharness:
@@ -634,38 +502,16 @@ raptor-tp6m-7-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-7
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-7-fenix:
-    description: "Raptor tp6m-7 on Fenix"
-    try-name: raptor-tp6m-7-fenix
-    treeherder-symbol: Rap-fenix(tp6m-7)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-7
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-8-geckoview:
     description: "Raptor tp6m-8 on GeckoView"
     try-name: raptor-tp6m-8-geckoview
     treeherder-symbol: Rap(tp6m-8)
     run-on-projects: ['mozilla-central']
     target: geckoview_example.apk
     tier: 2
     mozharness:
@@ -689,38 +535,16 @@ raptor-tp6m-8-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-8
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-8-fenix:
-    description: "Raptor tp6m-8 on Fenix"
-    try-name: raptor-tp6m-8-fenix
-    treeherder-symbol: Rap-fenix(tp6m-8)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-8
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-9-geckoview:
     description: "Raptor tp6m-9 on GeckoView"
     try-name: raptor-tp6m-9-geckoview
     treeherder-symbol: Rap(tp6m-9)
     target: geckoview_example.apk
     run-on-projects: ['mozilla-central']
     tier: 2
     mozharness:
@@ -745,38 +569,16 @@ raptor-tp6m-9-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-9
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-9-fenix:
-    description: "Raptor tp6m-9 on Fenix"
-    try-name: raptor-tp6m-9-fenix
-    treeherder-symbol: Rap-fenix(tp6m-9)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-9
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-10-geckoview:
     description: "Raptor tp6m-10 on GeckoView"
     try-name: raptor-tp6m-10-geckoview
     treeherder-symbol: Rap(tp6m-10)
     target: geckoview_example.apk
     run-on-projects: ['mozilla-central']
     tier: 2
     mozharness:
@@ -801,38 +603,16 @@ raptor-tp6m-10-refbrow:
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-10
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-tp6m-10-fenix:
-    description: "Raptor tp6m-10 on Fenix"
-    try-name: raptor-tp6m-10-fenix
-    treeherder-symbol: Rap-fenix(tp6m-10)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-10
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-tp6m-1-fennec:
     description: "Raptor tp6m-1 on Fennec"
     try-name: raptor-tp6m-1-fennec
     treeherder-symbol: Rap(tp6m-1)
     target: target.apk
     run-on-projects: []
     tier: 2
     mozharness:
@@ -953,610 +733,16 @@ raptor-tp6m-10-fennec:
     run-on-projects: []
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6m-10
             - --app=fennec
             - --binary=org.mozilla.fennec_aurora
 
-raptor-tp6m-1-fenix-cold:
-    description: "Raptor tp6m-1 cold page-load on Fenix"
-    try-name: raptor-tp6m-1-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-1)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-1
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-2-fenix-cold:
-    description: "Raptor tp6m-2 cold page-load on Fenix"
-    try-name: raptor-tp6m-2-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-2)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-2
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-3-fenix-cold:
-    description: "Raptor tp6m-3 cold page-load on Fenix"
-    try-name: raptor-tp6m-3-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-3)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-3
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-4-fenix-cold:
-    description: "Raptor tp6m-4 cold page-load on Fenix"
-    try-name: raptor-tp6m-4-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-4)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-4
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-5-fenix-cold:
-    description: "Raptor tp6m-5 cold page-load on Fenix"
-    try-name: raptor-tp6m-5-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-5)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-5
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-6-fenix-cold:
-    description: "Raptor tp6m-6 cold page-load on Fenix"
-    try-name: raptor-tp6m-6-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-6)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-6
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-7-fenix-cold:
-    description: "Raptor tp6m-7 cold page-load on Fenix"
-    try-name: raptor-tp6m-7-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-7)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-7
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-8-fenix-cold:
-    description: "Raptor tp6m-8 cold page-load on Fenix"
-    try-name: raptor-tp6m-8-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-8)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-8
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-9-fenix-cold:
-    description: "Raptor tp6m-9 cold page-load on Fenix"
-    try-name: raptor-tp6m-9-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-9)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-9
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-10-fenix-cold:
-    description: "Raptor tp6m-10 cold page-load on Fenix"
-    try-name: raptor-tp6m-10-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-10)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-10
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-11-fenix-cold:
-    description: "Raptor tp6m-11 cold page-load on Fenix"
-    try-name: raptor-tp6m-11-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-11)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-11
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-12-fenix-cold:
-    description: "Raptor tp6m-12 cold page-load on Fenix"
-    try-name: raptor-tp6m-12-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-12)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-12
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-13-fenix-cold:
-    description: "Raptor tp6m-13 cold page-load on Fenix"
-    try-name: raptor-tp6m-13-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-13)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-13
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-14-fenix-cold:
-    description: "Raptor tp6m-14 cold page-load on Fenix"
-    try-name: raptor-tp6m-14-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-14)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-14
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-15-fenix-cold:
-    description: "Raptor tp6m-15 cold page-load on Fenix"
-    try-name: raptor-tp6m-15-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-15)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-15
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-16-fenix-cold:
-    description: "Raptor tp6m-16 cold page-load on Fenix"
-    try-name: raptor-tp6m-16-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-16)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-16
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-17-fenix-cold:
-    description: "Raptor tp6m-17 cold page-load on Fenix"
-    try-name: raptor-tp6m-17-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-17)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-17
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-18-fenix-cold:
-    description: "Raptor tp6m-18 cold page-load on Fenix"
-    try-name: raptor-tp6m-18-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-18)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-18
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-19-fenix-cold:
-    description: "Raptor tp6m-19 cold page-load on Fenix"
-    try-name: raptor-tp6m-19-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-19)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-19
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-20-fenix-cold:
-    description: "Raptor tp6m-20 cold page-load on Fenix"
-    try-name: raptor-tp6m-20-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-20)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-20
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-21-fenix-cold:
-    description: "Raptor tp6m-21 cold page-load on Fenix"
-    try-name: raptor-tp6m-21-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-21)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-21
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-22-fenix-cold:
-    description: "Raptor tp6m-22 cold page-load on Fenix"
-    try-name: raptor-tp6m-22-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-22)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-22
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-23-fenix-cold:
-    description: "Raptor tp6m-23 cold page-load on Fenix"
-    try-name: raptor-tp6m-23-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-23)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-23
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-24-fenix-cold:
-    description: "Raptor tp6m-24 cold page-load on Fenix"
-    try-name: raptor-tp6m-24-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-24)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-24
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-25-fenix-cold:
-    description: "Raptor tp6m-25 cold page-load on Fenix"
-    try-name: raptor-tp6m-25-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-25)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-25
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-26-fenix-cold:
-    description: "Raptor tp6m-26 cold page-load on Fenix"
-    try-name: raptor-tp6m-26-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-26)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-26
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-tp6m-27-fenix-cold:
-    description: "Raptor tp6m-27 cold page-load on Fenix"
-    try-name: raptor-tp6m-27-fenix-cold
-    treeherder-symbol: Rap-fenix(tp6m-c-27)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-27
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-speedometer-firefox:
     description: "Raptor Speedometer on Firefox"
     variants: ["fission"]
     try-name: raptor-speedometer-firefox
     treeherder-symbol: Rap(sp)
     mozharness:
         extra-options:
             - --test=raptor-speedometer
@@ -1606,41 +792,16 @@ raptor-speedometer-geckoview-power:
             - --test=raptor-speedometer
             - --app=geckoview
             - --binary=org.mozilla.geckoview_example
             - --power-test
             - --page-cycles 5
             - --host HOST_IP
             - --activity=org.mozilla.geckoview_example.GeckoViewActivity
 
-raptor-scn-power-idle-fenix:
-    description: "Raptor idle-browser power-usage test on Fenix"
-    try-name: raptor-scn-power-idle-fenix
-    treeherder-symbol: Rap-fenix(idl-p)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --power-test
-            - --host HOST_IP
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-scn-power-idle-fennec:
     description: "Raptor idle-browser power-use measurement on Fennec"
     try-name: raptor-scn-power-idle-fennec
     treeherder-symbol: Rap-fennec(idl-p)
     target: target.apk
     run-on-projects: []
     tier: 3
     max-run-time: 1800
@@ -1688,41 +849,16 @@ raptor-scn-power-idle-refbrow:
         extra-options:
             - --test=raptor-scn-power-idle
             - --app=refbrow
             - --binary-path=org.mozilla.reference.browser.raptor
             - --power-test
             - --host HOST_IP
             - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
-raptor-scn-power-idle-bg-fenix:
-    description: "Raptor idle-browser (backgrounded) power-usage measurement on Fenix"
-    try-name: raptor-scn-power-idle-bg-fenix
-    treeherder-symbol: Rap-fenix(idlbg-p)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle-bg
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --power-test
-            - --host HOST_IP
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
 raptor-scn-power-idle-bg-fennec:
     description: "Raptor idle-browser (backgrounded) power-use measurement on Fennec"
     try-name: raptor-scn-power-idle-bg-fennec
     treeherder-symbol: Rap-fennec(idlbg-p)
     target: target.apk
     run-on-projects: []
     tier: 3
     max-run-time: 1800
@@ -2252,42 +1388,16 @@ raptor-youtube-playback-geckoview:
             - --test=raptor-youtube-playback
             - --app=geckoview
             - --binary=org.mozilla.geckoview_example
             - --activity=org.mozilla.geckoview_example.GeckoViewActivity
             # Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases
             # - --test-url-params is dynamically added from setup_raptor transform depending
             # on platform and project
 
-raptor-youtube-playback-fenix:
-    description: "Raptor YouTube Playback on Fenix"
-    try-name: raptor-youtube-playback-fenix
-    treeherder-symbol: Rap-fenix(ytp)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.fenix.v2.performance-test.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.fenix.v2.performance-test.latest.arm
-                name: target.apk
-    max-run-time: 3600
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-youtube-playback
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix.performancetest
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-            # Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases
-            # - --test-url-params is dynamically added from setup_raptor transform depending
-            # on platform and project
-
 raptor-tp6-1-firefox-cold:
     description: "Raptor tp6-1 cold page-load on Firefox"
     try-name: raptor-tp6-1-firefox-cold
     treeherder-symbol: Rap(tp6-c-1)
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6-cold-1