From 32988afd274ae776e00b87d096c9161371b9aa89 Mon Sep 17 00:00:00 2001
From: Axel Hecht <axel@pike.org>
Date: Wed, 13 Sep 2017 11:50:18 +0200
Subject: [PATCH] bug 1397721, build from l10n-central instead of
 releases/l10n/mozilla-beta for cross-channel l10n, r=Callek

MozReview-Commit-ID: 1wY54ZaRhZi

--HG--
extra : rebase_source : 2e3d7f5c9f4e26cbd94768c0dc613eb895894cf3
---
 .../mozharness/configs/multi_locale/jamun_android-armv6.json  | 4 ++--
 .../mozharness/configs/multi_locale/jamun_android-x86.json    | 4 ++--
 testing/mozharness/configs/multi_locale/jamun_android.json    | 4 ++--
 .../configs/multi_locale/mozilla-beta_android-armv6.json      | 4 ++--
 .../configs/multi_locale/mozilla-beta_android-x86.json        | 4 ++--
 .../mozharness/configs/multi_locale/mozilla-beta_android.json | 4 ++--
 .../multi_locale/release_mozilla-beta_android-armv6.json      | 4 ++--
 .../multi_locale/release_mozilla-beta_android-x86.json        | 4 ++--
 .../configs/multi_locale/release_mozilla-beta_android.json    | 4 ++--
 testing/mozharness/configs/single_locale/dev-mozilla-beta.py  | 2 +-
 .../configs/single_locale/dev-mozilla-beta_devedition.py      | 2 +-
 testing/mozharness/configs/single_locale/jamun.py             | 2 +-
 .../mozharness/configs/single_locale/jamun_android-api-16.py  | 2 +-
 testing/mozharness/configs/single_locale/mozilla-beta.py      | 2 +-
 .../configs/single_locale/mozilla-beta_android-api-16.py      | 4 ++--
 .../configs/single_locale/mozilla-beta_devedition.py          | 2 +-
 16 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
index 92309c9e8f04..e36fc43b0bb1 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
@@ -19,9 +19,9 @@
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
diff --git a/testing/mozharness/configs/multi_locale/jamun_android-x86.json b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
index e46ff296c5fb..f31539f3fa7a 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
@@ -19,9 +19,9 @@
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
diff --git a/testing/mozharness/configs/multi_locale/jamun_android.json b/testing/mozharness/configs/multi_locale/jamun_android.json
index 40daf3feea2a..0a92bb8140a7 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android.json
@@ -19,9 +19,9 @@
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build"
 }
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
index 3231e30b4496..242324c94f95 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
@@ -20,9 +20,9 @@
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
index 29fc4b7b7018..67dddd4901b8 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
@@ -20,9 +20,9 @@
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
index 28a847d38ec3..d07b02c61855 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
@@ -20,9 +20,9 @@
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build"
 }
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
index beef7728439b..9784e61b61ab 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
@@ -25,9 +25,9 @@
         "dest": "build/configs"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
index 4f7144b4045f..a684b395b27f 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
@@ -25,9 +25,9 @@
         "dest": "build/configs"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
index 2fa9c06fd430..6fc4c1b29b7b 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
@@ -25,9 +25,9 @@
         "dest": "build/configs"
     }],
     "vcs_share_base": "/builds/hg-shared",
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
-    "l10n_dir": "mozilla-beta",
+    "l10n_dir": "l10n-central",
     "merge_locales": true,
     "mozilla_dir": "build"
 }
diff --git a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
index 2c247f81a778..d7826dcf4ea0 100644
--- a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
@@ -4,7 +4,7 @@ config = {
     "update_channel": "beta-dev",
 
     # l10n
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
     # staging beta dev releases use jamun repo for now
diff --git a/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py b/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
index 56e133f48f46..6410fdfcaa26 100644
--- a/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
@@ -4,7 +4,7 @@ config = {
     "update_channel": "aurora-dev",  # devedition uses aurora based branding
 
     # l10n
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
     # staging beta dev releases use date repo for now
diff --git a/testing/mozharness/configs/single_locale/jamun.py b/testing/mozharness/configs/single_locale/jamun.py
index f2af75b62cf2..37986ffcfdd2 100644
--- a/testing/mozharness/configs/single_locale/jamun.py
+++ b/testing/mozharness/configs/single_locale/jamun.py
@@ -7,7 +7,7 @@ config = {
     "update_channel": "nightly-jamun",
 
     # l10n
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # mar
     "mar_tools_url": os.environ.get(
diff --git a/testing/mozharness/configs/single_locale/jamun_android-api-16.py b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
index 12dc31fb88e1..e887d0d11811 100644
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
@@ -36,7 +36,7 @@ config = {
         "revision": "%(revision)s",
         "dest": MOZILLA_DIR,
     }],
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     'vcs_share_base': "/builds/hg-shared",
 
diff --git a/testing/mozharness/configs/single_locale/mozilla-beta.py b/testing/mozharness/configs/single_locale/mozilla-beta.py
index 90ff23027852..ba4aa52ead66 100644
--- a/testing/mozharness/configs/single_locale/mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta.py
@@ -5,7 +5,7 @@ config = {
     "update_channel": "beta",
 
     # l10n
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
     "mozilla_dir": "mozilla-beta",
diff --git a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
index 1049cce390fa..4158ff71413e 100644
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
@@ -41,10 +41,10 @@ config = {
         "branch": "default",
         "dest": "tools"
     }],
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/%s" % BRANCH,
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     'vcs_share_base': HG_SHARE_BASE_DIR,
-    "l10n_dir": MOZILLA_DIR,
+    "l10n_dir": "l10n-central",
 
     "repack_env": {
         # so ugly, bug 951238
diff --git a/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py b/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py
index 00b5c2744a9c..32d93344a7ed 100644
--- a/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py
@@ -5,7 +5,7 @@ config = {
     "update_channel": "aurora",  # devedition uses aurora based branding
 
     # l10n
-    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
     "mozilla_dir": "mozilla-beta",