Bug 1365588 - fix l10n repacks for DevEdition on Beta, gecko, r=rail a=release FIREFOX_54_0b11_BUILD2 FIREFOX_54_0b11_RELEASE
authorJordan Lund <jlund@mozilla.com>
Wed, 17 May 2017 17:24:01 -0700
changeset 396410 51c849c595a0b5428d1d56e4ae668653437283e2
parent 396409 d3ce3e3812c9372a12b6416f0ceedd2e768b5277
child 396411 9675c8ebd64e924a10fb435d59d7bd7d1069b1ad
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)
reviewersrail, release
bugs1365588
milestone54.0
Bug 1365588 - fix l10n repacks for DevEdition on Beta, gecko, r=rail a=release MozReview-Commit-ID: 1arksrFhsv9
browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
browser/config/mozconfigs/win32/l10n-mozconfig-devedition
browser/config/mozconfigs/win64/l10n-mozconfig-devedition
testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
testing/mozharness/configs/single_locale/linux32_devedition.py
testing/mozharness/configs/single_locale/linux64_devedition.py
testing/mozharness/configs/single_locale/linux_devedition.py
testing/mozharness/configs/single_locale/macosx64_devedition.py
testing/mozharness/configs/single_locale/mozilla-beta_devedition.py
testing/mozharness/configs/single_locale/win32_devedition.py
testing/mozharness/configs/single_locale/win64_devedition.py
copy from browser/config/mozconfigs/linux32/l10n-mozconfig
copy to browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
@@ -1,13 +1,13 @@
 no_sccache=1
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
+ac_add_options --with-branding=browser/branding/aurora
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
copy from browser/config/mozconfigs/linux64/l10n-mozconfig
copy to browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
@@ -1,13 +1,13 @@
 no_sccache=1
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
+ac_add_options --with-branding=browser/branding/aurora
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
copy from browser/config/mozconfigs/macosx64/l10n-mozconfig
copy to browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@@ -1,14 +1,14 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/macosx/mozconfig.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
+ac_add_options --with-branding=browser/branding/aurora
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
copy from browser/config/mozconfigs/win32/l10n-mozconfig
copy to browser/config/mozconfigs/win32/l10n-mozconfig-devedition
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
@@ -1,14 +1,14 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-windows-version=603
-ac_add_options --enable-official-branding
+ac_add_options --with-branding=browser/branding/aurora
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
copy from browser/config/mozconfigs/win64/l10n-mozconfig
copy to browser/config/mozconfigs/win64/l10n-mozconfig-devedition
--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
@@ -1,15 +1,15 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-windows-version=603
-ac_add_options --enable-official-branding
+ac_add_options --with-branding=browser/branding/aurora
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
copy from testing/mozharness/configs/single_locale/dev-mozilla-beta.py
copy to testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
--- a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
@@ -1,12 +1,12 @@
 config = {
     "branch": "date",
     "nightly_build": True,
-    "update_channel": "beta-dev",
+    "update_channel": "aurora-dev",  # devedition uses aurora based branding
 
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
 
     # repositories
     # staging beta dev releases use date repo for now
     "mozilla_dir": "date",
     "repos": [{
new file mode 120000
--- /dev/null
+++ b/testing/mozharness/configs/single_locale/linux32_devedition.py
@@ -0,0 +1,1 @@
+linux_devedition.py
\ No newline at end of file
copy from testing/mozharness/configs/single_locale/linux64.py
copy to testing/mozharness/configs/single_locale/linux64_devedition.py
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "linux64",
     "stage_product": "firefox",
     "update_platform": "Linux_x86_64-gcc3",
-    "mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig",
+    "mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",
copy from testing/mozharness/configs/single_locale/linux.py
copy to testing/mozharness/configs/single_locale/linux_devedition.py
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "linux",
     "stage_product": "firefox",
     "update_platform": "Linux_x86-gcc3",
-    "mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig",
+    "mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",
copy from testing/mozharness/configs/single_locale/macosx64.py
copy to testing/mozharness/configs/single_locale/macosx64_devedition.py
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@@ -1,16 +1,16 @@
 import os
 
 config = {
     # mozconfig file to use, it depends on branch and platform names
     "platform": "macosx64",
     "stage_product": "firefox",
     "update_platform": "Darwin_x86_64-gcc3",
-    "mozconfig": "%(branch)s/browser/config/mozconfigs/macosx64/l10n-mozconfig",
+    "mozconfig": "%(branch)s/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition",
     "bootstrap_env": {
         "SHELL": '/bin/bash',
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "MOZ_PKG_PLATFORM": "mac",
         # "IS_NIGHTLY": "yes",
         "DIST": "%(abs_objdir)s",
copy from testing/mozharness/configs/single_locale/mozilla-beta.py
copy to testing/mozharness/configs/single_locale/mozilla-beta_devedition.py
--- a/testing/mozharness/configs/single_locale/mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py
@@ -1,13 +1,13 @@
 config = {
     "nightly_build": True,
     "branch": "mozilla-beta",
     "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-beta/",
-    "update_channel": "beta",
+    "update_channel": "aurora",  # devedition uses aurora based branding
 
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
 
     # repositories
     "mozilla_dir": "mozilla-beta",
     "repos": [{
         "vcs": "hg",
copy from testing/mozharness/configs/single_locale/win32.py
copy to testing/mozharness/configs/single_locale/win32_devedition.py
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@@ -1,16 +1,16 @@
 import os
 import sys
 
 config = {
     "platform": "win32",
     "stage_product": "firefox",
     "update_platform": "WINNT_x86-msvc",
-    "mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig",
+    "mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig-devedition",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",
copy from testing/mozharness/configs/single_locale/win64.py
copy to testing/mozharness/configs/single_locale/win64_devedition.py
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@@ -1,16 +1,16 @@
 import os
 import sys
 
 config = {
     "platform": "win64",
     "stage_product": "firefox",
     "update_platform": "WINNT_x86_64-msvc",
-    "mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig",
+    "mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig-devedition",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",