bug 918068: switch b2g builds to use aus4.mozilla.org as their update server - switch remainder of mozilla-central devices. r=aki, vingtetun. a=edmorley DONTBUILD because the change is nightly only FIREFOX_AURORA_32_BASE
authorBen Hearsum <bhearsum@mozilla.com>
Mon, 09 Jun 2014 10:58:48 -0400
changeset 187591 16f3cac5e8fe471e12f76d6a94a477b14e78df7c
parent 187590 68ac46c1b1f744bc4f13083a4031b7c20dc82c6f
child 187592 3e7bdce61b7ddcabe0e351a2abd9b8af22b83c45
child 187613 6e6335222eaa9c6e0b6e2dc2db50629afb80b526
child 187622 101f7b3319628e709a8e54fca773f9a7ac91710f
child 187640 ceb784b90138172478ecaf488bec59a48b0ff76d
push id26926
push userbhearsum@mozilla.com
push dateMon, 09 Jun 2014 14:59:20 +0000
treeherdermozilla-central@16f3cac5e8fe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki, vingtetun, edmorley
bugs918068
milestone32.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 918068: switch b2g builds to use aus4.mozilla.org as their update server - switch remainder of mozilla-central devices. r=aki, vingtetun. a=edmorley DONTBUILD because the change is nightly only
b2g/app/b2g.js
b2g/config/hamachi/config.json
b2g/config/helix/config.json
b2g/config/nexus-4/config.json
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -544,25 +544,17 @@ pref("b2g.update.download-watchdog-max-r
 pref("app.update.enabled", true);
 pref("app.update.auto", false);
 pref("app.update.silent", false);
 pref("app.update.mode", 0);
 pref("app.update.incompatible.mode", 0);
 pref("app.update.staging.enabled", true);
 pref("app.update.service.enabled", true);
 
-// The URL hosting the update manifest.
-// Temporary hack to only put Flame builds on aus4. 18 is Jelly Bean (4.3).
-// This needs to be changed if Flame upgrades to 19 (Kit Kat) before other devices
-// move to aus4.
-#if ANDROID_VERSION == 18
 pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%PRODUCT_DEVICE%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
-#else
-pref("app.update.url", "http://update.boot2gecko.org/%CHANNEL%/update.xml");
-#endif
 pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");
 
 // Interval at which update manifest is fetched.  In units of seconds.
 pref("app.update.interval", 86400); // 1 day
 // Don't throttle background updates.
 pref("app.update.download.backgroundInterval", 0);
 
 // Retry update socket connections every 30 seconds in the cases of certain kinds of errors
--- a/b2g/config/hamachi/config.json
+++ b/b2g/config/hamachi/config.json
@@ -14,17 +14,18 @@
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml",
         "{workdir}/out/target/product/hamachi/*.mar"
     ],
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
-        "MOZ_TELEMETRY_REPORTING": "1"
+        "MOZ_TELEMETRY_REPORTING": "1",
+        "B2G_UPDATE_CHANNEL": "nightly"
     },
     "b2g_manifest": "hamachi.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-hamachi.tar.xz"],
     "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
--- a/b2g/config/helix/config.json
+++ b/b2g/config/helix/config.json
@@ -22,17 +22,18 @@
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml"
     ],
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
-        "ANDROIDFS_DIR": "{workdir}/helix-ics"
+        "ANDROIDFS_DIR": "{workdir}/helix-ics",
+        "B2G_UPDATE_CHANNEL": "nightly"
     },
     "b2g_manifest": "helix.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["helix-ics.tar.xz"],
     "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
--- a/b2g/config/nexus-4/config.json
+++ b/b2g/config/nexus-4/config.json
@@ -22,17 +22,18 @@
         "{workdir}/flash.sh",
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml"
     ],
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
-        "MOZ_TELEMETRY_REPORTING": "1"
+        "MOZ_TELEMETRY_REPORTING": "1",
+        "B2G_UPDATE_CHANNEL": "nightly"
     },
     "b2g_manifest": "nexus-4.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": [],
     "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",