From 1596fab43fb54edc2692c2c418ffd8801f83373d Mon Sep 17 00:00:00 2001
From: Marian Raiciof <mraiciof@mozilla.com>
Date: Fri, 6 Dec 2019 15:08:21 +0000
Subject: [PATCH] Bug 1597991 - created speedometer tests for fenix and
 fennec68 r=perftest-reviewers,rwood,alexandru.irimovici

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

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/test/raptor-fenix.yml          | 32 +++++++++++++++++++
 taskcluster/ci/test/raptor-fennec68.yml       | 24 ++++++++++++++
 taskcluster/ci/test/test-sets.yml             |  8 +++++
 .../tests/benchmarks/raptor-speedometer.ini   | 10 ++++++
 testing/raptor/test/test_manifest.py          |  2 +-
 5 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/taskcluster/ci/test/raptor-fenix.yml b/taskcluster/ci/test/raptor-fenix.yml
index bfaeb9d09e59..a0bcbd1df972 100644
--- a/taskcluster/ci/test/raptor-fenix.yml
+++ b/taskcluster/ci/test/raptor-fenix.yml
@@ -683,3 +683,35 @@ raptor-youtube-playback-fenix:
             # 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-speedometer-fenix:
+    description: "Raptor Speedometer on Fenix"
+    try-name: raptor-speedometer-fenix
+    treeherder-symbol: Rap-fenix(sp)
+    run-on-projects: []
+    tier: 2
+    e10s: true
+    max-run-time: 2000
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
+
+raptor-speedometer-fenix-power:
+    description: "Raptor Speedometer power on Fenix"
+    try-name: raptor-speedometer-fenix-power
+    treeherder-symbol: Rap-fenix(sp-p)
+    run-on-projects: []
+    tier: 2
+    e10s: true
+    max-run-time: 2000
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.fenix.IntentReceiverActivity
diff --git a/taskcluster/ci/test/raptor-fennec68.yml b/taskcluster/ci/test/raptor-fennec68.yml
index 5fa4a12a1376..834dd50213ce 100644
--- a/taskcluster/ci/test/raptor-fennec68.yml
+++ b/taskcluster/ci/test/raptor-fennec68.yml
@@ -275,3 +275,27 @@ raptor-tp6m-14-fennec68-cold:
             - --test=raptor-tp6m-14-fennec68-cold
             - --app=fennec
             - --binary=org.mozilla.firefox
+
+raptor-speedometer-fennec68:
+    description: "Raptor Speedometer on Fennec68"
+    try-name: raptor-speedometer-fennec68
+    treeherder-symbol: Rap(sp-f68)
+    max-run-time: 2000
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer-fennec68
+            - --app=fennec
+            - --binary=org.mozilla.firefox
+
+raptor-speedometer-fennec68-power:
+    description: "Raptor Speedometer power on Fennec68"
+    try-name: raptor-speedometer-fennec68-power
+    treeherder-symbol: Rap(sp-p-f68)
+    max-run-time: 2000
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer-fennec68
+            - --app=fennec
+            - --binary=org.mozilla.firefox
+            - --power-test
+            - --host HOST_IP
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index b86b6f9761aa..cd4466cd4829 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -573,6 +573,8 @@ android-hw-arm7-qr:
 android-hw-arm7-raptor:
     - raptor-speedometer-geckoview
     - raptor-speedometer-refbrow
+    - raptor-speedometer-fenix
+    - raptor-speedometer-fennec68
     - raptor-youtube-playback-fenix
     - raptor-youtube-playback-geckoview
     - raptor-tp6m-1-geckoview
@@ -717,6 +719,8 @@ android-hw-arm7-raptor:
 android-hw-aarch64-raptor:
     - raptor-speedometer-geckoview
     - raptor-speedometer-refbrow
+    - raptor-speedometer-fenix
+    - raptor-speedometer-fennec68
     - raptor-youtube-playback-fenix
     - raptor-youtube-playback-geckoview
     - raptor-tp6m-1-geckoview
@@ -850,6 +854,8 @@ android-hw-aarch64-raptor:
 
 android-hw-arm7-raptor-power:
     - raptor-speedometer-geckoview-power
+    - raptor-speedometer-fenix-power
+    - raptor-speedometer-fennec68-power
     - raptor-scn-power-idle-fenix
     - raptor-scn-power-idle-geckoview
     - raptor-scn-power-idle-refbrow
@@ -877,6 +883,8 @@ android-hw-arm7-raptor-cpu-memory-power:
 
 android-hw-aarch64-raptor-power:
     - raptor-speedometer-geckoview-power
+    - raptor-speedometer-fenix-power
+    - raptor-speedometer-fennec68-power
     - raptor-scn-power-idle-fenix
     - raptor-scn-power-idle-geckoview
     - raptor-scn-power-idle-refbrow
diff --git a/testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini b/testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini
index 402eb8b49919..e36c120fd4bb 100644
--- a/testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini
+++ b/testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini
@@ -35,3 +35,13 @@ apps = geckoview
 page_timeout = 900000  # 15 min
 page_cycles = 1
 apps = refbrow
+
+[raptor-speedometer-fenix]
+page_timeout = 1800000  # 30 min
+page_cycles = 1
+apps = fenix
+
+[raptor-speedometer-fennec68]
+page_timeout = 1800000  # 30 min
+page_cycles = 1
+apps = fennec
diff --git a/testing/raptor/test/test_manifest.py b/testing/raptor/test/test_manifest.py
index 5d31157652c4..d1707ac87039 100644
--- a/testing/raptor/test/test_manifest.py
+++ b/testing/raptor/test/test_manifest.py
@@ -320,7 +320,7 @@ def test_get_raptor_test_list_fenix(create_args):
 
     test_list = get_raptor_test_list(args, mozinfo.os)
     # we don't have any actual fenix tests yet
-    assert len(test_list) == 0
+    assert len(test_list) == 1
 
 
 def test_add_test_url_params_with_single_extra_param():