Bug 1740103: [mozproxy] set mitmproxy 7 as the default for recording and playback r=perftest-reviewers,sparky

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

testing/mozbase/mozproxy/mozproxy/driver.py

@@ -48,7 +48,7 @@ def main():
     )
     parser.add_argument(
         "--tool-version",
-        default="6.0.2",
+        default="7.0.4",
         help="The playback tool version to use (default: %(default)s)",
     )
     parser.add_argument(

testing/performance/hooks_recording.py

@@ -61,7 +61,7 @@ def before_runs(env):
             app_name = "firefox"
 
         name = [
-            "mitm6",
+            "mitm7",
             platform_name,
             "gve" if app_name == "geckoview_example" else app_name,
             test_site["name"],

testing/raptor/raptor/perftest.py

@@ -533,7 +533,7 @@ class Perftest(object):
         self.config.update(
             {
                 "playback_tool": test.get("playback"),
-                "playback_version": test.get("playback_version", "5.1.1"),
+                "playback_version": test.get("playback_version", "7.0.4"),
                 "playback_files": [
                     os.path.join(playback_dir, test.get("playback_pageset_manifest"))
                 ],

testing/raptor/raptor/tests/tp6/desktop/browsertime-tp6.ini

@@ -18,7 +18,7 @@ page_cycles = 25
 page_timeout = 60000
 playback = mitmproxy
 playback_pageset_manifest = mitm5-linux-firefox-{subtest}.manifest
-playback_version = 5.1.1
+playback_version = 7.0.4
 type = pageload
 unit = ms
 use_live_sites = false
@@ -26,9 +26,13 @@ use_live_sites = false
 # Keep this list in alphabetical order
 
 [amazon]
+playback_pageset_manifest = mitm5-linux-firefox-amazon.manifest
+playback_version = 5.1.1
 test_url = https://www.amazon.com/s?k=laptop&ref=nb_sb_noss_1
 
 [bing-search]
+playback_pageset_manifest = mitm5-linux-firefox-bing-search.manifest
+playback_version = 5.1.1
 test_url = https://www.bing.com/search?q=barack+obama
 
 [buzzfeed]
@@ -56,6 +60,8 @@ secondary_url = https://www.ebay.com/deals
 test_url = https://www.ebay.com/
 
 [espn]
+playback_pageset_manifest = mitm5-linux-firefox-espn.manifest
+playback_version = 5.1.1
 test_url = http://www.espn.com/nba/story/_/page/allstarweekend25788027/the-comparison-lebron-james-michael-jordan-their-own-words
 
 [expedia]
@@ -71,6 +77,8 @@ secondary_url = https://www.facebook.com/marketplace/?ref=bookmark
 test_url = https://www.facebook.com
 
 [fandom]
+playback_pageset_manifest = mitm5-linux-firefox-fandom.manifest
+playback_version = 5.1.1
 test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
 
 [google-docs]
@@ -86,9 +94,13 @@ playback_version = 6.0.2
 test_url = https://docs.google.com/document/d/1vUnn0ePU-ynArE1OdxyEHXR2G0sl74ja_st_4OOzlgE/preview
 
 [google-mail]
+playback_pageset_manifest = mitm5-linux-firefox-google-mail.manifest
+playback_version = 5.1.1
 test_url = https://mail.google.com/
 
 [google-search]
+playback_pageset_manifest = mitm5-linux-firefox-google-search.manifest
+playback_version = 5.1.1
 test_url = https://www.google.com/search?hl=en&q=barack+obama&cad=h
 
 [google-slides]
@@ -104,6 +116,8 @@ secondary_url = https://www.imdb.com/title/tt0084967/episodes/?ref_=tt_ov_epl
 test_url = https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2
 
 [imgur]
+playback_pageset_manifest = mitm5-linux-firefox-imgur.manifest
+playback_version = 5.1.1
 test_url = https://imgur.com/gallery/m5tYJL6
 
 [instagram]
@@ -144,9 +158,12 @@ test_url = https://www.office.com/launch/word
 
 [outlook]
 playback_pageset_manifest = mitm5-linux-firefox-live.manifest
+playback_version = 5.1.1
 test_url = https://outlook.live.com/mail/inbox
 
 [paypal]
+playback_pageset_manifest = mitm5-linux-firefox-paypal.manifest
+playback_version = 5.1.1
 test_url = https://www.paypal.com/myaccount/summary/
 
 [pinterest]
@@ -168,12 +185,18 @@ secondary_url = https://www.tumblr.com/tagged/funny+cats?sort=top
 test_url = https://www.tumblr.com/dashboard
 
 [twitch]
+playback_pageset_manifest = mitm5-linux-firefox-twitch.manifest
+playback_version = 5.1.1
 test_url = https://www.twitch.tv/videos/326804629
 
 [twitter]
+playback_pageset_manifest = mitm5-linux-firefox-twitter.manifest
+playback_version = 5.1.1
 test_url = https://twitter.com/BarackObama
 
 [wikia]
+playback_pageset_manifest = mitm5-linux-firefox-wikia.manifest
+playback_version = 5.1.1
 test_url = https://marvel.fandom.com/wiki/Black_Panther
 
 [wikipedia]
@@ -183,6 +206,8 @@ secondary_url = https://en.wikipedia.org/wiki/Joe_Biden
 test_url = https://en.wikipedia.org/wiki/Barack_Obama
 
 [yahoo-mail]
+playback_pageset_manifest = mitm5-linux-firefox-yahoo-mail.manifest
+playback_version = 5.1.1
 test_url = https://mail.yahoo.com/
 
 [youtube]