bug 1361361: allow MAR_CHANNEL_ID and ACCEPTED_MAR_CHANNEL_IDS to be set different for DevEdition. r=nalexander,rstrong, a=ritu
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 05 May 2017 14:47:09 -0400
changeset 396176 93700f9bdc9cb4e278d331049dff765c75771632
parent 396175 3e76a9b4f4fd14595a4919b6b839549911efdc3d
child 396177 7868898154ed9e19d98d9aa4c53b7da57c2bd187
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, rstrong, ritu
bugs1361361
milestone54.0
bug 1361361: allow MAR_CHANNEL_ID and ACCEPTED_MAR_CHANNEL_IDS to be set different for DevEdition. r=nalexander,rstrong, a=ritu MozReview-Commit-ID: FC2Sqq2bMxH
browser/confvars.sh
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -43,22 +43,27 @@ MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
 # specified. It should never point to the "official" branding directory.
 # For mozilla-beta, mozilla-release, or mozilla-central repositories, use
 # "unofficial" branding.
 # For the mozilla-aurora repository, use "aurora".
 MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
 MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-# This should usually be the same as the value MAR_CHANNEL_ID.
+# ACCEPTED_MAR_CHANNEL_IDS should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-beta
+if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then
+  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora
+  MAR_CHANNEL_ID=firefox-mozilla-aurora
+else
+  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
+  MAR_CHANNEL_ID=firefox-mozilla-beta
+fi
 MOZ_PROFILE_MIGRATOR=1
 MOZ_JSDOWNLOADS=1
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
 
 # Include the DevTools client, not just the server (which is the default)
 MOZ_DEVTOOLS=all