Bug 1505526 - Rename existing raptor tp6 to tp6-1 and raptor gdocs to tp6-2; r=jmaher

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

--HG--
rename : testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6.manifest => testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-1.manifest
rename : testing/raptor/raptor/playback/mitmproxy-recordings-raptor-gdocs.manifest => testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-2.manifest
rename : testing/raptor/raptor/tests/raptor-tp6.ini => testing/raptor/raptor/tests/raptor-tp6-1.ini
rename : testing/raptor/raptor/tests/raptor-gdocs.ini => testing/raptor/raptor/tests/raptor-tp6-2.ini
extra : moz-landing-system : lando

taskcluster/ci/test/raptor.yml

@@ -32,20 +32,20 @@ job-defaults:
                 default:
                     - raptor/linux_config.py
 
-raptor-tp6-firefox:
-    description: "Raptor tp6 on Firefox"
-    try-name: raptor-tp6-firefox
-    treeherder-symbol: Rap(tp6)
+raptor-tp6-1-firefox:
+    description: "Raptor tp6-1 on Firefox"
+    try-name: raptor-tp6-1-firefox
+    treeherder-symbol: Rap(tp6-1)
     run-on-projects: built-projects
     max-run-time: 1800
     mozharness:
         extra-options:
-            - --test=raptor-tp6
+            - --test=raptor-tp6-1
 
-raptor-tp6-chrome:
-    description: "Raptor tp6 on Chrome"
-    try-name: raptor-tp6-chrome
-    treeherder-symbol: Rap-C(tp6)
+raptor-tp6-1-chrome:
+    description: "Raptor tp6-1 on Chrome"
+    try-name: raptor-tp6-1-chrome
+    treeherder-symbol: Rap-C(tp6-1)
     run-on-projects: ['try', 'mozilla-central']
     tier:
         by-test-platform:
@@ -54,7 +54,32 @@ raptor-tp6-chrome:
     max-run-time: 1200
     mozharness:
         extra-options:
-            - --test=raptor-tp6
+            - --test=raptor-tp6-1
+            - --app=chrome
+
+raptor-tp6-2-firefox:
+    description: "Raptor tp6-2 on Firefox"
+    try-name: raptor-tp6-2-firefox
+    treeherder-symbol: Rap(tp6-2)
+    run-on-projects: built-projects
+    max-run-time: 1200
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6-2
+
+raptor-tp6-2-chrome:
+    description: "Raptor tp6-2 on Chrome"
+    try-name: raptor-tp6-2-chrome
+    treeherder-symbol: Rap-C(tp6-2)
+    run-on-projects: ['try', 'mozilla-central']
+    tier:
+        by-test-platform:
+            linux64.*: 3
+            default: 2
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6-2
             - --app=chrome
 
 raptor-speedometer-firefox:
@@ -182,28 +207,6 @@ raptor-webaudio-chrome:
             - --test=raptor-webaudio
             - --app=chrome
 
-raptor-gdocs-firefox:
-    description: "Raptor gdocs on Firefox"
-    try-name: raptor-gdocs-firefox
-    treeherder-symbol: Rap(gdocs)
-    run-on-projects: built-projects
-    max-run-time: 1200
-    mozharness:
-        extra-options:
-            - --test=raptor-gdocs
-
-raptor-gdocs-chrome:
-    description: "Raptor gdocs on Chrome"
-    try-name: raptor-gdocs-chrome
-    treeherder-symbol: Rap-C(gdocs)
-    run-on-projects: ['try', 'mozilla-central']
-    tier: 2
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-gdocs
-            - --app=chrome
-
 raptor-sunspider-firefox:
     description: "Raptor SunSpider on Firefox"
     try-name: raptor-sunspider-firefox

taskcluster/ci/test/test-sets.yml

@@ -77,24 +77,24 @@ talos:
     # - talos-h2 Bug 1487031 - Disabled for not finding actionable regressions
 
 raptor-firefox:
-    - raptor-tp6-firefox
+    - raptor-tp6-1-firefox
+    - raptor-tp6-2-firefox
     - raptor-speedometer-firefox
     - raptor-stylebench-firefox
     - raptor-motionmark-htmlsuite-firefox
     - raptor-motionmark-animometer-firefox
     - raptor-webaudio-firefox
-    - raptor-gdocs-firefox
     - raptor-sunspider-firefox
     - raptor-wasm-godot-firefox
 
 raptor-chrome:
-    - raptor-tp6-chrome
+    - raptor-tp6-1-chrome
+    - raptor-tp6-2-chrome
     - raptor-speedometer-chrome
     - raptor-stylebench-chrome
     - raptor-motionmark-htmlsuite-chrome
     - raptor-motionmark-animometer-chrome
     - raptor-webaudio-chrome
-    - raptor-gdocs-chrome
     - raptor-sunspider-chrome
     - raptor-wasm-godot-chrome
 

testing/raptor/raptor/raptor.ini

@@ -1,17 +1,19 @@
-# raptor tests
-[include:tests/raptor-tp6.ini]
+# raptor pageload tests
+[include:tests/raptor-tp6-1.ini]
+[include:tests/raptor-tp6-2.ini]
+
+# raptor benchmark tests
+[include:tests/raptor-assorted-dom.ini]
+[include:tests/raptor-motionmark-animometer.ini]
+[include:tests/raptor-motionmark-htmlsuite.ini]
 [include:tests/raptor-speedometer.ini]
 [include:tests/raptor-stylebench.ini]
 [include:tests/raptor-sunspider.ini]
-[include:tests/raptor-motionmark-htmlsuite.ini]
-[include:tests/raptor-motionmark-animometer.ini]
 [include:tests/raptor-unity-webgl.ini]
-[include:tests/raptor-webaudio.ini]
-[include:tests/raptor-gdocs.ini]
-[include:tests/raptor-wasm-misc.ini]
-[include:tests/raptor-wasm-misc-baseline.ini]
-[include:tests/raptor-wasm-misc-ion.ini]
 [include:tests/raptor-wasm-godot.ini]
 [include:tests/raptor-wasm-godot-baseline.ini]
 [include:tests/raptor-wasm-godot-ion.ini]
-[include:tests/raptor-assorted-dom.ini]
+[include:tests/raptor-wasm-misc.ini]
+[include:tests/raptor-wasm-misc-baseline.ini]
+[include:tests/raptor-wasm-misc-ion.ini]
+[include:tests/raptor-webaudio.ini]

testing/raptor/raptor/tests/raptor-tp6-1.ini

@@ -2,14 +2,14 @@
 # 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/.
 
-# raptor tp6
+# raptor tp6-1
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 python3_win_manifest = python3{x64}.manifest
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6.manifest
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-1.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true

testing/raptor/raptor/tests/raptor-tp6-2.ini

@@ -2,14 +2,14 @@
 # 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/.
 
-# raptor gdocs
+# raptor tp6-2
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 python3_win_manifest = python3{x64}.manifest
-playback_pageset_manifest = mitmproxy-recordings-raptor-gdocs.manifest
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-2.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
@@ -18,42 +18,42 @@ page_timeout = 60000
 gecko_profile_interval = 1
 gecko_profile_entries = 14000000
 
-[raptor-google-docs-firefox]
+[raptor-tp6-docs-firefox]
 apps = firefox
 test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
 playback_recordings = google-docs.mp
 measure = fnbpaint, hero
 hero = hero1
 
-[raptor-google-sheets-firefox]
+[raptor-tp6-sheets-firefox]
 apps = firefox
 test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
 playback_recordings = google-sheets.mp
 measure = fnbpaint, hero
 hero = hero1
 
-[raptor-google-slides-firefox]
+[raptor-tp6-slides-firefox]
 apps = firefox
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
 playback_recordings = google-slides.mp
 measure = fnbpaint, hero
 hero = hero1
 
-[raptor-google-docs-chrome]
+[raptor-tp6-docs-chrome]
 apps = chrome
 test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
 playback_recordings = google-docs.mp
 measure = fcp, hero
 hero = hero1
 
-[raptor-google-sheets-chrome]
+[raptor-tp6-sheets-chrome]
 apps = chrome
 test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
 playback_recordings = google-sheets.mp
 measure = fcp, hero
 hero = hero1
 
-[raptor-google-slides-chrome]
+[raptor-tp6-slides-chrome]
 apps = chrome
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
 playback_recordings = google-slides.mp