Bug 1562871 Clean up desktop test ini files r=perftest-reviewers,alexandru.irimovici,AlexandruIonescu,arnold.iakab
authorFlorin Strugariu <fstrugariu@mozilla.com>
Wed, 03 Jul 2019 08:00:37 +0000
changeset 543914 b45fd955bfd449d854fa6ed757e214df75a63a3c
parent 543913 6430800a95e1d2101859af8145ed1353c6cf79c9
child 543915 6bcdd2b94604d1d0f79d1be7184f34ab4165b3f5
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersperftest-reviewers, alexandru
bugs1562871
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1562871 Clean up desktop test ini files r=perftest-reviewers,alexandru.irimovici,AlexandruIonescu,arnold.iakab Differential Revision: https://phabricator.services.mozilla.com/D36594
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-binast-instagram.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-linkedin.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-office.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-paypal.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-pinterest.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-1.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-2.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-3.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-4.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-6.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-7.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tumblr.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-twitter.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-wikipedia.manifest
testing/raptor/raptor/playback/mitmproxy-recordings-raptor-yahoo-news.manifest
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-2.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-3.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-4.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-5.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-6.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-7.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-8.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-9.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-binast-1.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-1.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-2.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-3.ini
testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-4.ini
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-binast-instagram.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 6626956,
-    "visibility": "public",
-    "digest": "edc07e9eb78e3ec83364f5b9150a40c2640338957a7c53da848a1c0a5f0b917411a088d2ad7f2a5be0deb42dc5a2413534a1b682940f0e4c12f703d50b6ff1f2",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-instagram-binast.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-linkedin.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 4214850,
-    "visibility": "public",
-    "digest": "4d4e15097e14c7dc2a1199ccc2f3ee73fb292d1fcfa361776fc37e8b245d4ce5db8c2d79b9a79c32db4f9fdbc223df74f0173dd21a079397dcf859a34f7bcb84",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-linkedin.zip",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-office.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2340028,
-    "visibility": "public",
-    "digest": "3c08f87b661507ecd493ba7021e883fe5e68c1037eafde6a07d6998db712bc8449d4823814da179801d9573b2a4fb525f0506c79dc1abb6de30f24c174dae8f6",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-office.zip",
-    "unpack": true
-}
-]
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-paypal.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1037796,
-    "visibility": "public",
-    "digest": "913d7631cc2f1685310ea1d807cf4dc6a91298f6f24700393e46272128de9bb47ce44c9e88a771ff2169d0458c83b1df07b654456495b7d8fb6c6899fba0bc3a",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-paypal.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-pinterest.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 11627712,
-    "visibility": "public",
-    "digest": "a0dd4ccb99bac02a38b3c67baa08296c3e894837aba1c1b0750c592db6ff962ab0c61f557ffb45c2ea77e95345954a0786bf764448d090cc6cf76679d1a8a616",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-pinterest.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-1.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    {
-        "filename": "mitmproxy-recordings-raptor-tp6.zip",
-        "size": 8767174,
-        "digest": "3343f54b6c727a2061534872888da4e3aa647e81903c675dc318c717ed0c93f6ce4e2b98c66eb4128376cf8507590531283c95f3951259607edaaae28944d9a5",
-        "algorithm": "sha512",
-        "unpack": true
-    }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-2.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    {
-        "filename": "mitmproxy-recordings-raptor-gdocs.zip",
-        "size": 26179496,
-        "digest": "eb32218815d3c2187807f3a18d6df1657e01a215820deaaa7a035f06d180780ac9652479ac7db1d8cde3728a890521aff2e0a5c4738304966b2a93ce1b7f33bb",
-        "algorithm": "sha512",
-        "unpack": true
-    }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-3.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    {
-        "filename": "raptor-tp6-3.zip",
-        "size": 24512088,
-        "digest": "5b8080cf842a50fe2055127daa084fa9f133307965e4d8af246978150b8b3b11f1fb06cdf65ba69e13c875b77db14e7494cdb940376b264c3aefb5b53e22b892",
-        "algorithm": "sha512",
-        "unpack": true
-    }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-4.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    {
-        "filename": "raptor-tp6-4.zip",
-        "size": 1643188,
-        "digest": "0e9f2a23323f93f7a9839ab49d84555cce03bfab2196aa8670e604d6df390b22f0594527cecf7b2efd0449dd87507ec934bdcc74f1ebee68c22161f4104b6513",
-        "algorithm": "sha512",
-        "unpack": true
-    }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-6.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    {
-        "filename": "raptor-tp6-6.zip",
-        "size": 2240008,
-        "digest": "21110ee297074413a72343bcb7d22ae88efce104de6e7eea5916e2dae004b29746ec6dd6155686cffed816e88d38ad1bbc04fe1253623ed8c0d4256a146d8b77",
-        "algorithm": "sha512",
-        "unpack": true
-    }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6-7.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1862165,
-    "visibility": "public",
-    "digest": "3b5d06a79b2f9fb4e18534229844da69ca6f8e0f0759562947a29f681e27204ebae25b9a56c4ae2b95dabf067c3afeda424bcfb4d104bbc474a3970d4f2177aa",
-    "algorithm": "sha512",
-    "filename": "raptor-tp6-7.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tumblr.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 20872384,
-    "visibility": "public",
-    "digest": "d49ac687231a71a19d946e49ad9abea172316201d58ebd84bea360b70792948b36454966a0193039bafe18311444b3f25ab3f6101b77fa0a1e77b7ec83f3c8dc",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-tumblr.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-twitter.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 17821103,
-    "visibility": "public",
-    "digest": "46ab2d3b58fe5be72029bae6ed2e84b8b81ac46d30a1ffaf4ac4ba3ba4284e73507d3becc2a274b9d5ef3497f91bb655fa48df959f0ed1c98e0581e638702200",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-twitter.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-wikipedia.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1336699,
-    "visibility": "public",
-    "digest": "efd7090b826d03f54ef58e631d8b24e0e7263e06fb679a8c2f072dde9e7a8223e02812db73e6fb71b08d4247f7652a72c94029959e34f6d49271c6172c0587cb",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-wikipedia.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
deleted file mode 100644
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-yahoo-news.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 11849146,
-    "visibility": "public",
-    "digest": "c29479b82a26db3722d6fe60c6a9d5b0849c828b4904553c115712610ead7be508d1c194050860140f8d9f4057b5e5088c085ea52319e37a0c9862fa120e5f22",
-    "algorithm": "sha512",
-    "filename": "mitmproxy-tp6-yahoo-news.zip",
-    "unpack": true
-  }
-]
\ No newline at end of file
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini
@@ -2,71 +2,61 @@
 # 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-10
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 60000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-paypal-firefox]
 apps = firefox
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.paypal.com/myaccount/summary/
 playback_pageset_manifest = mitm4-linux-firefox-paypal.manifest
-test_url = https://www.paypal.com/myaccount/summary/
 playback_recordings = paypal.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-tumblr-firefox]
 apps = firefox
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.tumblr.com/dashboard
 playback_pageset_manifest = mitm4-linux-firefox-tumblr.manifest
-test_url = https://www.tumblr.com/dashboard
 playback_recordings = tumblr.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-paypal-chrome]
 apps = chrome
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.paypal.com/myaccount/summary/
 playback_pageset_manifest = mitm4-linux-firefox-paypal.manifest
-test_url = https://www.paypal.com/myaccount/summary/
 playback_recordings = paypal.mp
 measure = fcp, loadtime
 
 [raptor-tp6-tumblr-chrome]
 apps = chrome
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.tumblr.com/dashboard
 playback_pageset_manifest = mitm4-linux-firefox-tumblr.manifest
-test_url = https://www.tumblr.com/dashboard
 playback_recordings = tumblr.mp
 measure = fcp, loadtime
 
 [raptor-tp6-paypal-chromium]
 apps = chromium
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.paypal.com/myaccount/summary/
 playback_pageset_manifest = mitm4-linux-firefox-paypal.manifest
-test_url = https://www.paypal.com/myaccount/summary/
 playback_recordings = paypal.mp
 measure = fcp, loadtime
 
 [raptor-tp6-tumblr-chromium]
 apps = chromium
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.tumblr.com/dashboard
 playback_pageset_manifest = mitm4-linux-firefox-tumblr.manifest
-test_url = https://www.tumblr.com/dashboard
 playback_recordings = tumblr.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-2.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-2.ini
@@ -2,99 +2,82 @@
 # 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-2
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-2.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 60000
 gecko_profile_interval = 1
 gecko_profile_entries = 14000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-docs-firefox]
 apps = firefox
 test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-docs.manifest
-playback_version = 4.0.4
 playback_recordings = google-docs.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-sheets-firefox]
 apps = firefox
 test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-sheets.manifest
-playback_version = 4.0.4
 playback_recordings = google-sheets.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-slides-firefox]
 apps = firefox
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-slides.manifest
-playback_version = 4.0.4
 playback_recordings = google-slides.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-docs-chrome]
 apps = chrome
 test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-docs.manifest
-playback_version = 4.0.4
 playback_recordings = google-docs.mp
 measure = fcp, loadtime
 
 [raptor-tp6-sheets-chrome]
 apps = chrome
 test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-sheets.manifest
-playback_version = 4.0.4
 playback_recordings = google-sheets.mp
 measure = fcp, loadtime
 
 [raptor-tp6-slides-chrome]
 apps = chrome
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-slides.manifest
-playback_version = 4.0.4
 playback_recordings = google-slides.mp
 measure = fcp, loadtime
 
 [raptor-tp6-docs-chromium]
 apps = chromium
 test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-docs.manifest
-playback_version = 4.0.4
 playback_recordings = google-docs.mp
 measure = fcp, loadtime
 
 [raptor-tp6-sheets-chromium]
 apps = chromium
 test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-sheets.manifest
-playback_version = 4.0.4
 playback_recordings = google-sheets.mp
 measure = fcp, loadtime
 
 [raptor-tp6-slides-chromium]
 apps = chromium
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-slides.manifest
-playback_version = 4.0.4
 playback_recordings = google-slides.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-3.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-3.ini
@@ -2,99 +2,82 @@
 # 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-3
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-3.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-imdb-firefox]
 apps = firefox
 test_url = https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-imdb.manifest
 playback_recordings = imdb.mp
-playback_version = 4.0.4
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-imgur-firefox]
 apps = firefox
 test_url = https://imgur.com/gallery/m5tYJL6
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-imgur.manifest
 playback_recordings = imgur.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-fandom-firefox]
 apps = firefox
 test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-fandom.manifest
 playback_recordings = fandom.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-imdb-chrome]
 apps = chrome
 test_url = https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-imdb.manifest
 playback_recordings = imdb.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-imgur-chrome]
 apps = chrome
 test_url = https://imgur.com/gallery/m5tYJL6
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-imgur.manifest
 playback_recordings = imgur.mp
 measure = fcp, loadtime
 
 [raptor-tp6-fandom-chrome]
 apps = chrome
 test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-fandom.manifest
 playback_recordings = fandom.mp
 measure = fcp, loadtime
 
 [raptor-tp6-imdb-chromium]
 apps = chromium
 test_url = https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-imdb.manifest
 playback_recordings = imdb.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-imgur-chromium]
 apps = chromium
 test_url = https://imgur.com/gallery/m5tYJL6
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-imgur.manifest
 playback_recordings = imgur.mp
 measure = fcp, loadtime
 
 [raptor-tp6-fandom-chromium]
 apps = chromium
 test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-fandom.manifest
 playback_recordings = fandom.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-4.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-4.ini
@@ -3,59 +3,60 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # raptor tp6-4
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_version = 4.0.4
+playback_upstream_cert = true
 playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-bing-firefox]
 apps = firefox
+test_url = https://www.bing.com/search?q=barack+obama
 playback_pageset_manifest = mitm4-linux-firefox-bing-search.manifest
-test_url = https://www.bing.com/search?q=barack+obama
 playback_recordings = bing.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-yandex-firefox]
 apps = firefox
+test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
 playback_pageset_manifest = mitm4-linux-firefox-yandex.manifest
-test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
 playback_recordings = yandex.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-bing-chrome]
 apps = chrome
+test_url = https://www.bing.com/search?q=barack+obama
 playback_pageset_manifest = mitm4-linux-firefox-bing-search.manifest
-test_url = https://www.bing.com/search?q=barack+obama
 playback_recordings = bing.mp
 measure = fcp, loadtime
 
 [raptor-tp6-yandex-chrome]
 apps = chrome
+test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
 playback_pageset_manifest = mitm4-linux-firefox-yandex.manifest
-test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
 playback_recordings = yandex.mp
 measure = fcp, loadtime
 
 [raptor-tp6-bing-chromium]
 apps = chromium
+test_url = https://www.bing.com/search?q=barack+obama
 playback_pageset_manifest = mitm4-linux-firefox-bing-search.manifest
-test_url = https://www.bing.com/search?q=barack+obama
 playback_recordings = bing.mp
 measure = fcp, loadtime
 
 [raptor-tp6-yandex-chromium]
 apps = chromium
+test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
 playback_pageset_manifest = mitm4-linux-firefox-yandex.manifest
-test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
 playback_recordings = yandex.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-5.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-5.ini
@@ -1,65 +1,71 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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-5
 
 [DEFAULT]
 type =  pageload
-playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-5.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-apple-firefox]
 apps = firefox
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.apple.com/macbook-pro/
 playback_pageset_manifest = mitm4-linux-firefox-apple.manifest
-test_url = https://www.apple.com/macbook-pro/
 playback_recordings = apple.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-microsoft-firefox]
 apps = firefox
 test_url = https://www.microsoft.com/en-us/windows/get-windows-10
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-5.manifest
+playback_recordings = microsoft.mp
 page_timeout = 60000
-playback_recordings = microsoft.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-apple-chrome]
 apps = chrome
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.apple.com/macbook-pro/
 playback_pageset_manifest = mitm4-linux-firefox-apple.manifest
-test_url = https://www.apple.com/macbook-pro/
 playback_recordings = apple.mp
 measure = fcp, loadtime
 
 [raptor-tp6-microsoft-chrome]
 apps = chrome
 test_url = https://www.microsoft.com/en-us/windows/get-windows-10
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-5.manifest
 playback_recordings = microsoft.mp
 measure = fcp, loadtime
 
 [raptor-tp6-apple-chromium]
 apps = chromium
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.apple.com/macbook-pro/
 playback_pageset_manifest = mitm4-linux-firefox-apple.manifest
-test_url = https://www.apple.com/macbook-pro/
 playback_recordings = apple.mp
 measure = fcp, loadtime
 
 [raptor-tp6-microsoft-chromium]
 apps = chromium
 test_url = https://www.microsoft.com/en-us/windows/get-windows-10
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-5.manifest
 playback_recordings = microsoft.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-6.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-6.ini
@@ -2,104 +2,84 @@
 # 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-6
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-6.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-reddit-firefox]
 apps = firefox
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
 playback_pageset_manifest = mitm4-linux-firefox-reddit.manifest
-test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
 playback_recordings = reddit.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-yahoo-news-firefox]
 apps = firefox
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
 playback_pageset_manifest = mitm4-linux-firefox-yahoo-news.manifest
-test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
 playback_recordings = yahoo-news.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-netflix-firefox]
 apps = firefox
 test_url = https://www.netflix.com/title/80117263
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-netflix.manifest
 playback_recordings = netflix.mp
-playback_version = 4.0.4
-playback_upstream_cert = false
 preferences = {"media.autoplay.default": 1,
                "media.eme.enabled": true}
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-reddit-chrome]
 apps = chrome
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
 playback_pageset_manifest = mitm4-linux-firefox-reddit.manifest
-test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
 playback_recordings = reddit.mp
 measure = fcp, loadtime
 
 [raptor-tp6-yahoo-news-chrome]
 apps = chrome
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
 playback_pageset_manifest = mitm4-linux-firefox-yahoo-news.manifest
-test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
 playback_recordings = yahoo-news.mp
 measure = fcp, loadtime
 
 [raptor-tp6-netflix-chrome]
 apps = chrome
 test_url = https://www.netflix.com/title/80117263
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-netflix.manifest
 playback_recordings = netflix.mp
-playback_version = 4.0.4
-playback_upstream_cert = False
 measure = fcp, loadtime
 
 [raptor-tp6-reddit-chromium]
 apps = chromium
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
 playback_pageset_manifest = mitm4-linux-firefox-reddit.manifest
-test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
 playback_recordings = reddit.mp
 measure = fcp, loadtime
 
 [raptor-tp6-yahoo-news-chromium]
 apps = chromium
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
 playback_pageset_manifest = mitm4-linux-firefox-yahoo-news.manifest
-test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
 playback_recordings = yahoo-news.mp
 measure = fcp, loadtime
 
 [raptor-tp6-netflix-chromium]
 apps = chromium
 test_url = https://www.netflix.com/title/80117263
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-netflix.manifest
 playback_recordings = netflix.mp
-playback_version = 4.0.4
-playback_upstream_cert = False
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-7.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-7.ini
@@ -2,93 +2,91 @@
 # 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-7
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6-7.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 60000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-instagram-firefox]
 apps = firefox
 test_url = https://www.instagram.com/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-instagram.manifest
 playback_recordings = instagram.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-twitter-firefox]
 apps = firefox
 test_url = https://twitter.com/BarackObama
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-twitter.manifest
 playback_recordings = twitter.mp
-playback_version = 4.0.4
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-yahoo-mail-firefox]
 apps = firefox
 test_url = https://mail.yahoo.com/
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 playback_pageset_manifest = mitmproxy-tp6-yahoo-mail.manifest
 playback_recordings = yahoo-mail.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-instagram-chrome]
 apps = chrome
 test_url = https://www.instagram.com/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-instagram.manifest
 playback_recordings = instagram.mp
 measure = fcp, loadtime
 
 [raptor-tp6-twitter-chrome]
 apps = chrome
 test_url = https://twitter.com/BarackObama
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-twitter.manifest
 playback_recordings = twitter.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-yahoo-mail-chrome]
 apps = chrome
 test_url = https://mail.yahoo.com/
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 playback_pageset_manifest = mitmproxy-tp6-yahoo-mail.manifest
 playback_recordings = yahoo-mail.mp
 measure = fcp, loadtime
 
 [raptor-tp6-instagram-chromium]
 apps = chromium
 test_url = https://www.instagram.com/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-instagram.manifest
 playback_recordings = instagram.mp
 measure = fcp, loadtime
 
 [raptor-tp6-twitter-chromium]
 apps = chromium
 test_url = https://twitter.com/BarackObama
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-twitter.manifest
 playback_recordings = twitter.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-yahoo-mail-chromium]
 apps = chromium
 test_url = https://mail.yahoo.com/
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 playback_pageset_manifest = mitmproxy-tp6-yahoo-mail.manifest
 playback_recordings = yahoo-mail.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-8.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-8.ini
@@ -2,98 +2,82 @@
 # 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-8
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-ebay-firefox]
 apps = firefox
 test_url = https://www.ebay.com/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-ebay.manifest
 playback_recordings = ebay.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-linkedin-firefox]
 apps = firefox
 test_url = https://www.linkedin.com/in/thommy-harris-hk-385723106/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-linkedin.manifest
 playback_recordings = linkedin.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-wikipedia-firefox]
 apps = firefox
 test_url = https://en.wikipedia.org/wiki/Barack_Obama
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-wikipedia.manifest
-playback_version = 4.0.4
 playback_recordings = firefox-wikipedia.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-ebay-chrome]
 apps = chrome
 test_url = https://www.ebay.com/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-ebay.manifest
 playback_recordings = ebay.mp
 measure = fcp, loadtime
 
 [raptor-tp6-linkedin-chrome]
 apps = chrome
 test_url = https://www.linkedin.com/in/thommy-harris-hk-385723106/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-linkedin.manifest
 playback_recordings = linkedin.mp
 measure = fcp, loadtime
 
 [raptor-tp6-wikipedia-chrome]
 apps = chrome
 test_url =  https://en.wikipedia.org/wiki/Barack_Obama
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-wikipedia.manifest
-playback_version = 4.0.4
 playback_recordings = firefox-wikipedia.mp
 measure = fcp, loadtime
 
 [raptor-tp6-ebay-chromium]
 apps = chromium
 test_url = https://www.ebay.com/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-ebay.manifest
 playback_recordings = ebay.mp
 measure = fcp, loadtime
 
 [raptor-tp6-linkedin-chromium]
 apps = chromium
 test_url = https://www.linkedin.com/in/thommy-harris-hk-385723106/
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-linkedin.manifest
 playback_recordings = linkedin.mp
 measure = fcp, loadtime
 
 [raptor-tp6-wikipedia-chromium]
 apps = chromium
 test_url = https://en.wikipedia.org/wiki/Barack_Obama
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-wikipedia.manifest
-playback_version = 4.0.4
 playback_recordings = firefox-wikipedia.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-9.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-9.ini
@@ -2,119 +2,112 @@
 # 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-9
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
-playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+playback_version = 4.0.4
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-google-mail-firefox]
 apps = firefox
 test_url = https://mail.google.com/
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 playback_pageset_manifest = mitmproxy-recordings-raptor-google-mail.manifest
 playback_recordings = google-mail.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-office-firefox]
 apps = firefox
 test_url = https://office.live.com/start/Word.aspx?omkt=en-US
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-office.manifest
 playback_recordings = office.mp
-playback_version = 4.0.4
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-outlook-firefox]
 apps = firefox
 test_url = https://outlook.live.com/mail/inbox
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitmproxy-recordings-raptor-outlook.manifest
 playback_recordings = outlook.mp
-playback_version = 4.0.4
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-pinterest-firefox]
 apps = firefox
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-pinterest.manifest
 playback_recordings = pinterest.mp
 test_url = https://pinterest.com/
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6-google-mail-chrome]
 apps = chrome
 test_url = https://mail.google.com/
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 playback_pageset_manifest = mitmproxy-recordings-raptor-google-mail.manifest
 playback_recordings = google-mail.mp
 measure = fcp, loadtime
 
 [raptor-tp6-office-chrome]
 apps = chrome
 test_url = https://office.live.com/start/Word.aspx?omkt=en-US
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-office.manifest
 playback_recordings = office.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-outlook-chrome]
 apps = chrome
 test_url =https://outlook.live.com/mail/inbox
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitmproxy-recordings-raptor-outlook.manifest
 playback_recordings = outlook.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-pinterest-chrome]
 apps = chrome
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-pinterest.manifest
 playback_recordings = pinterest.mp
 test_url = https://pinterest.com/
 measure = fcp, loadtime
 
 [raptor-tp6-google-mail-chromium]
 apps = chromium
 test_url = https://mail.google.com/
+playback_version = 2.0.2
+playback_upstream_cert = true
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
 playback_pageset_manifest = mitmproxy-recordings-raptor-google-mail.manifest
 playback_recordings = google-mail.mp
 measure = fcp, loadtime
 
 [raptor-tp6-office-chromium]
 apps = chromium
 test_url = https://office.live.com/start/Word.aspx?omkt=en-US
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-office.manifest
 playback_recordings = office.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-outlook-chromium]
 apps = chromium
 test_url =https://outlook.live.com/mail/inbox
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitmproxy-recordings-raptor-outlook.manifest
 playback_recordings = outlook.mp
-playback_version = 4.0.4
 measure = fcp, loadtime
 
 [raptor-tp6-pinterest-chromium]
 apps = chromium
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-pinterest.manifest
 playback_recordings = pinterest.mp
 test_url = https://pinterest.com/
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-binast-1.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-binast-1.ini
@@ -3,26 +3,27 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # raptor tp6 binast 1
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_version = 4.0.4
+playback_upstream_cert = true
 playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
-playback_pageset_manifest = mitm4-linux-firefox-instagram-binast.manifest
 page_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 30000
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 alert_on = fcp, loadtime
 
 [raptor-tp6-binast-instagram-firefox]
 apps = firefox
 test_url = https://www.instagram.com/
+playback_pageset_manifest = mitm4-linux-firefox-instagram-binast.manifest
 playback_recordings = instagram-binast.mp
-measure = fnbpaint, fcp, dcf, loadtime
 preferences = {"dom.script_loader.binast_encoding.enabled": true,
               "dom.script_loader.binast_encoding.domain.restrict.list": "*.instagram.com"}
+measure = fnbpaint, fcp, dcf, loadtime
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-1.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-1.ini
@@ -3,16 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # raptor tp6-cold-1
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_version = 4.0.4
+playback_upstream_cert = true
 playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-amazon.manifest
 browser_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 60000
 gecko_profile_interval = 1
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-2.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-2.ini
@@ -3,16 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # raptor tp6-cold-2
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_version = 4.0.4
+playback_upstream_cert = true
 playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-facebook.manifest
 browser_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 60000
 gecko_profile_interval = 1
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-3.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-3.ini
@@ -3,16 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # raptor tp6-cold-3
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_version = 4.0.4
+playback_upstream_cert = true
 playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-google-search.manifest
 browser_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 60000
 gecko_profile_interval = 1
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-4.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-4.ini
@@ -3,16 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # raptor tp6-cold-4
 
 [DEFAULT]
 type =  pageload
 playback = mitmproxy
 playback_version = 4.0.4
+playback_upstream_cert = true
 playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_pageset_manifest = mitm4-linux-firefox-youtube.manifest
 browser_cycles = 25
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
 page_timeout = 60000
 gecko_profile_interval = 1