Bug 1297753 - Configure list of add-ons for e10s rollout on release 49. r=mconley, a=lizzard
authorFelipe Gomes <felipc@gmail.com>
Fri, 02 Sep 2016 16:45:12 -0300
changeset 342582 238f82d981fcb0cf6765c8371b2e035882bc3fa4
parent 342581 ac2639b95b60381df0a7e074cafccaef8cc617ed
child 342583 93fb251e3d9965553a21a5f1e6db7807467720cd
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, lizzard
bugs1297753
milestone49.0
Bug 1297753 - Configure list of add-ons for e10s rollout on release 49. r=mconley, a=lizzard MozReview-Commit-ID: 6cVebHG2yLo
browser/extensions/e10srollout/bootstrap.js
toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -12,17 +12,18 @@ Cu.import("resource://gre/modules/Update
 
  // The amount of people to be part of e10s
 const TEST_THRESHOLD = {
   "beta"    : 0.5,  // 50%
   "release" : 1.0,  // 100%
 };
 
 const ADDON_ROLLOUT_POLICY = {
-  "beta"    : "2a", // Set 2 + any WebExtension
+  "beta"    : "49a", // 10 tested add-ons + any WebExtension
+  "release" : "49a", // 10 tested add-ons + any WebExtension
 };
 
 const PREF_COHORT_SAMPLE       = "e10s.rollout.cohortSample";
 const PREF_COHORT_NAME         = "e10s.rollout.cohort";
 const PREF_E10S_OPTED_IN       = "browser.tabs.remote.autostart";
 const PREF_E10S_FORCE_ENABLED  = "browser.tabs.remote.force-enable";
 const PREF_E10S_FORCE_DISABLED = "browser.tabs.remote.force-disable";
 const PREF_TOGGLE_E10S         = "browser.tabs.remote.autostart.2";
--- a/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
+++ b/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
@@ -41,55 +41,87 @@ const ADDONS = {
   "Emoji": { // Emoji Cheatsheet
     id: "jid1-Xo5SuA6qc1DFpw@jetpack", minVersion: "1.1.1",
   },
 
   "ASP": { // Awesome Screenshot Plus
     id: "jid0-GXjLLfbCoAx0LcltEdFrEkQdQPI@jetpack", minVersion: "3.0.10",
   },
 
-  "PersonasPlus": {
+  "PersonasPlus": { // PersonasPlus
     id: "personas@christopher.beard", minVersion: "1.8.0",
   },
 
+  "ACR": { // Add-on Compatibility Reporter
+    id: "compatibility@addons.mozilla.org", minVersion: "2.2.0",
+  },
+
   // Add-ons used for testing
   "test1": {
     id: "bootstrap1@tests.mozilla.org", minVersion: "1.0",
   },
 
   "test2": {
     id: "bootstrap2@tests.mozilla.org", minVersion: "1.0",
   },
 };
 
 // NOTE: Do not modify sets or policies after they have already been
 // published to users. They must remain unchanged to provide valid data.
-const set1 = [ADDONS.Emoji,
-              ADDONS.ASP,
-              ADDONS.DYTV];
 
+// Set 2 used during 48 Beta cycle. Kept here for historical reasons.
 const set2 = [ADDONS.Greasemonkey,
               ADDONS.DYTV,
               ADDONS.VDH,
               ADDONS.Lightbeam,
               ADDONS.ABP,
               ADDONS.uBlockOrigin,
               ADDONS.Emoji,
               ADDONS.ASP,
               ADDONS.PersonasPlus];
 
+const set49Release = [
+  ADDONS.Greasemonkey,
+  ADDONS.DYTV,
+  ADDONS.VDH,
+  ADDONS.Lightbeam,
+  ADDONS.ABP,
+  ADDONS.uBlockOrigin,
+  ADDONS.Emoji,
+  ADDONS.ASP,
+  ADDONS.PersonasPlus,
+  ADDONS.ACR
+];
+
+// These are only the add-ons in the Add-Ons Manager Discovery
+// pane. This set is here in case we need to reduce add-ons
+// exposure live on Release.
+const set49PaneOnly = [
+  ADDONS.ABP,
+  ADDONS.VDH,
+  ADDONS.Emoji,
+  ADDONS.ASP,
+  ADDONS.ACR
+]
+
 // We use these named policies to correlate the telemetry
 // data with them, in order to understand how each set
 // is behaving in the wild.
 const RolloutPolicy = {
-  "1a": { addons: set1, webextensions: true },
+  // Used during 48 Beta cycle
   "2a": { addons: set2, webextensions: true },
+  "2b": { addons: set2, webextensions: false },
 
-  "1b": { addons: set1, webextensions: false },
-  "2b": { addons: set2, webextensions: false },
+  // Set agreed for Release 49
+  "49a": { addons: set49Release, webextensions: true },
+  "49b": { addons: set49Release, webextensions: false },
+
+  // Smaller set that can be used for Release 49
+  "49limiteda": { addons: set49PaneOnly, webextensions: true },
+  "49limitedb": { addons: set49PaneOnly, webextensions: false },
 
   "xpcshell-test": { addons: [ADDONS.test1, ADDONS.test2], webextensions: false },
 };
 
 Object.defineProperty(this, "isAddonPartOfE10SRollout", {
   configurable: false,
   enumerable: false,
   writable: false,