Bug 1668268 - Enable mitm5 on browsertime desktop tests. r=perftest-reviewers,Bebe

This patch enabled mitm5 for browsertime desktop tests. It also fixes a small issue in mozproxy which sets the return code to 0 on a failure.

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

taskcluster/ci/test/browsertime-desktop.yml

@@ -65,8 +65,7 @@ browsertime-tp6:
         - paypal
         - pinterest
         - reddit
-        # Bug 1665925 - Permafailing
-        # - tumblr
+        - tumblr
         - twitch
         - twitter
         - wikipedia

testing/mozbase/mozproxy/mozproxy/backends/mitm/mitm.py

@@ -307,7 +307,7 @@ class Mitmproxy(Playback):
         # cannot continue as we won't be able to playback the pages
         LOG.error("Aborting: Mitmproxy process did not startup")
         self.stop_mitmproxy_playback()
-        sys.exit()  # XXX why do we need to do that? a raise is not enough?
+        sys.exit(1)  # XXX why do we need to do that? a raise is not enough?
 
     def stop_mitmproxy_playback(self):
         """Stop the mitproxy server playback"""

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

@@ -16,8 +16,9 @@ measure = fnbpaint, fcp, dcf, loadtime
 page_cycles = 25
 page_timeout = 60000
 playback = mitmproxy
-playback_pageset_manifest = mitm4-linux-firefox-{subtest}.manifest
-playback_recordings = {subtest}.mp
+playback_pageset_manifest = mitm5-linux-firefox-{subtest}.manifest
+playback_recordings = mitm5-linux-firefox-{subtest}.mp
+playback_version = 5.1.1
 type = pageload
 unit = ms
 use_live_sites = false
@@ -32,19 +33,15 @@ test_url = https://www.apple.com/macbook-pro/
 
 [bing-search]
 test_url = https://www.bing.com/search?q=barack+obama
-playback_recordings = bing.mp
 
 [ebay]
 test_url = https://www.ebay.com/
 
 [facebook]
 test_url = https://www.facebook.com
-playback_recordings = mitm4-linux-firefox-facebook-old.mp
-playback_pageset_manifest = mitm4-linux-firefox-facebook-old.manifest
 
 [facebook-redesign]
 test_url = https://www.facebook.com
-playback_recordings = mitm4-linux-firefox-facebook-redesign.mp
 
 [fandom]
 test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
@@ -84,10 +81,13 @@ test_url = https://www.netflix.com/title/80117263
 
 [office]
 test_url = https://office.live.com/start/Word.aspx?omkt=en-US
+playback_recordings = mitm5-linux-firefox-live-office.mp
+playback_pageset_manifest = mitm5-linux-firefox-live-office.manifest
 
 [outlook]
 test_url = https://outlook.live.com/mail/inbox
-playback_recordings = mitm4-linux-firefox-live.mp
+playback_recordings = mitm5-linux-firefox-live.mp
+playback_pageset_manifest = mitm5-linux-firefox-live.manifest
 
 [paypal]
 test_url = https://www.paypal.com/myaccount/summary/
@@ -109,7 +109,6 @@ test_url = https://twitter.com/BarackObama
 
 [wikipedia]
 test_url = https://en.wikipedia.org/wiki/Barack_Obama
-playback_recordings = mitm4-linux-firefox-wikipedia.mp
 
 [yahoo-mail]
 test_url = https://mail.yahoo.com/