Bug 1551324: Hook up remaining Fennec and Fenix jobs in CI for scn-power-idle tests. r=perftest-reviewers,rwood,sparky

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

--HG--
extra : moz-landing-system : lando

taskcluster/ci/config.yml

@@ -44,6 +44,7 @@ treeherder:
         'Rap-P-1proc': 'Raptor power tests on Firefox without e10s'
         'Rap-fenix': 'Raptor performance tests on Fenix'
         'Rap-fennec': 'Raptor performance tests on Fennec'
+        'Rap-fennec-1proc': 'Raptor performance tests on Fennec without e10s'
         'Rap-refbrow': 'Raptor performance tests on the reference browser'
         'T': 'Talos performance tests'
         'T-1proc': 'Talos performance tests without e10s'

taskcluster/ci/test/raptor.yml

@@ -1107,6 +1107,47 @@ raptor-speedometer-geckoview-power:
             - --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)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.branch.master.latest.raptor.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.branch.master.latest.raptor.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.raptor
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+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)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+            - --power-test
+            - --host HOST_IP
+
 raptor-scn-power-idle-geckoview:
     description: "Raptor idle-browser power-use measurement on GeckoView"
     try-name: raptor-scn-power-idle-geckoview
@@ -1125,19 +1166,21 @@ raptor-scn-power-idle-geckoview:
             - --binary=org.mozilla.geckoview_example
             - --power-test
             - --host HOST_IP
-            - --activity=GeckoViewActivity
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
 
 raptor-scn-power-idle-refbrow:
     description: "Raptor idle-browser power-use measurement on Reference Browser"
     try-name: raptor-scn-power-idle-refbrow
     treeherder-symbol: Rap-refbrow(idl)
     target:
-        index: project.mobile.reference-browser.signed-nightly.nightly.latest
-        name: target.arm.apk
-    run-on-projects:
         by-test-platform:
-            android-hw.*/pgo: ['try']
-            default: ['try']
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.reference-browser.signed-nightly.nightly.latest
+                name: target.aarch64.apk
+            default:
+                index: project.mobile.reference-browser.signed-nightly.nightly.latest
+                name: target.arm.apk
+    run-on-projects: ['try']
     tier: 3
     max-run-time: 1800
     mozharness:
@@ -1147,7 +1190,7 @@ raptor-scn-power-idle-refbrow:
             - --binary-path=org.mozilla.reference.browser
             - --power-test
             - --host HOST_IP
-            - --activity=BrowserTestActivity
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
 
 raptor-speedometer-fennec:
     description: "Raptor Speedometer on Fennec"

taskcluster/ci/test/test-sets.yml

@@ -597,11 +597,15 @@ android-hw-aarch64-raptor:
 
 android-hw-arm7-raptor-power:
     - raptor-speedometer-geckoview-power
+    - raptor-scn-power-idle-fenix
+    - raptor-scn-power-idle-fennec
     - raptor-scn-power-idle-geckoview
     - raptor-scn-power-idle-refbrow
 
 android-hw-aarch64-raptor-power:
     - raptor-speedometer-geckoview-power
+    - raptor-scn-power-idle-fenix
+    - raptor-scn-power-idle-fennec
     - raptor-scn-power-idle-geckoview
     - raptor-scn-power-idle-refbrow
 

testing/raptor/raptor/tests/raptor-scn-power-idle.ini

@@ -9,6 +9,12 @@ page_timeout = 1320000
 lower_is_better = true
 alert_threshold = 2.0
 
+[raptor-scn-power-idle-fenix]
+apps = fenix
+
+[raptor-scn-power-idle-fennec]
+apps = fennec
+
 [raptor-scn-power-idle-geckoview]
 apps = geckoview