Bug 1434365: Specify mozconfig in L10N repacks by using parts; r=Callek

Differential Revision: https://phabricator.services.mozilla.com/D509

--HG--
extra : rebase_source : 185f46837087649c790db1ee1ce5eb5ee3ee447b

testing/mozharness/configs/single_locale/alder.py

@@ -35,7 +35,6 @@ config = {
     ),
 
     # repositories
-    "mozilla_dir": "alder",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/ash.py

@@ -35,7 +35,6 @@ config = {
     ),
 
     # repositories
-    "mozilla_dir": "ash",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/ash_android-api-16.py

@@ -53,8 +53,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
-    "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",

testing/mozharness/configs/single_locale/dev-mozilla-beta.py

@@ -8,7 +8,6 @@ config = {
 
     # repositories
     # staging beta dev releases use jamun repo for now
-    "mozilla_dir": "jamun",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/dev-mozilla-release.py

@@ -8,7 +8,6 @@ config = {
 
     # repositories
     # staging release uses jamun
-    "mozilla_dir": "jamun",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/jamun.py

@@ -17,7 +17,6 @@ config = {
     ),
 
     # repositories
-    "mozilla_dir": "jamun",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/jamun_android-api-16.py

@@ -50,8 +50,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
-    "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",

testing/mozharness/configs/single_locale/linux.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "linux",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/linux32/l10n-mozconfig",
+    "app_name": "browser",
+    "mozconfig_platform": "linux32",
+    "mozconfig_variant": "l10n-mozconfig",
     "ssh_key_dir": "/home/mock_mozilla/.ssh",
     "log_name": "single_locale",
     "objdir": "obj-firefox",

testing/mozharness/configs/single_locale/linux64.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "linux64",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/linux64/l10n-mozconfig",
+    "app_name": "browser",
+    "mozconfig_platform": "linux64",
+    "mozconfig_variant": "l10n-mozconfig",
     "ssh_key_dir": "/home/mock_mozilla/.ssh",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",

testing/mozharness/configs/single_locale/linux64_devedition.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "linux64",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition",
+    "app_name": "browser",
+    "mozconfig_platform": "linux64",
+    "mozconfig_variant": "l10n-mozconfig-devedition",
     "ssh_key_dir": "/home/mock_mozilla/.ssh",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",

testing/mozharness/configs/single_locale/linux_devedition.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "linux",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition",
+    "app_name": "browser",
+    "mozconfig_platform": "linux32",
+    "mozconfig_variant": "l10n-mozconfig-devedition",
     "ssh_key_dir": "/home/mock_mozilla/.ssh",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",

testing/mozharness/configs/single_locale/macosx64.py

@@ -2,7 +2,9 @@ config = {
     # mozconfig file to use, it depends on branch and platform names
     "platform": "macosx64",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/macosx64/l10n-mozconfig",
+    "app_name": "browser",
+    "mozconfig_platform": "macosx64",
+    "mozconfig_variant": "l10n-mozconfig",
     "ssh_key_dir": "~/.ssh",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",

testing/mozharness/configs/single_locale/macosx64_devedition.py

@@ -2,7 +2,9 @@ config = {
     # mozconfig file to use, it depends on branch and platform names
     "platform": "macosx64",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition",
+    "app_name": "browser",
+    "mozconfig_platform": "macosx64",
+    "mozconfig_variant": "l10n-mozconfig-devedition",
     "ssh_key_dir": "~/.ssh",
     "log_name": "single_locale",
     "objdir": "obj-firefox",

testing/mozharness/configs/single_locale/maple_android-api-16.py

@@ -51,8 +51,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
-    "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",

testing/mozharness/configs/single_locale/mozilla-aurora.py

@@ -17,7 +17,6 @@ config = {
     ),
 
     # repositories
-    "mozilla_dir": "mozilla-aurora",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py

@@ -57,8 +57,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
-    "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",

testing/mozharness/configs/single_locale/mozilla-beta.py

@@ -13,7 +13,6 @@ config = {
     "mar_tools_url": os.environ["MAR_TOOLS_URL"],
 
     # repositories
-    "mozilla_dir": "mozilla-beta",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py

@@ -55,7 +55,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "key_alias": "release",
     # Mock

testing/mozharness/configs/single_locale/mozilla-beta_devedition.py

@@ -8,7 +8,6 @@ config = {
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
-    "mozilla_dir": "mozilla-beta",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/mozilla-central.py

@@ -17,7 +17,6 @@ config = {
     ),
 
     # repositories
-    "mozilla_dir": "mozilla-central",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py

@@ -57,8 +57,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
-    "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",

testing/mozharness/configs/single_locale/mozilla-esr52.py

@@ -13,7 +13,6 @@ config = {
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
 
     # repositories
-    "mozilla_dir": "mozilla-esr52",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/mozilla-release.py

@@ -13,7 +13,6 @@ config = {
     "mar_tools_url": os.environ["MAR_TOOLS_URL"],
 
     # repositories
-    "mozilla_dir": "mozilla-release",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py

@@ -55,7 +55,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "key_alias": "release",
     # Mock

testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_16.py

@@ -57,7 +57,6 @@ config = {
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-16/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
-    "mozilla_dir": MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
 
     # Mock

testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_16.py

@@ -57,7 +57,6 @@ config = {
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-16/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
-    "mozilla_dir": MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
 
     # Mock

testing/mozharness/configs/single_locale/try.py

@@ -18,7 +18,6 @@ config = {
     ),
 
     # repositories
-    "mozilla_dir": "try",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",

testing/mozharness/configs/single_locale/try_android-api-16.py

@@ -55,8 +55,6 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
-    "mozilla_dir": MOZILLA_DIR,
-    "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android", # XXX Validate

testing/mozharness/configs/single_locale/win32.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "win32",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/win32/l10n-mozconfig",
+    "app_name": "browser",
+    "mozconfig_platform": "win32",
+    "mozconfig_variant": "l10n-mozconfig",
     "ssh_key_dir": "~/.ssh",
     "log_name": "single_locale",
     "objdir": "obj-firefox",

testing/mozharness/configs/single_locale/win32_devedition.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "win32",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/win32/l10n-mozconfig-devedition",
+    "app_name": "browser",
+    "mozconfig_platform": "win32",
+    "mozconfig_variant": "l10n-mozconfig-devedition",
     "ssh_key_dir": "~/.ssh",
     "objdir": "obj-firefox",
     "vcs_share_base": "c:/builds/hg-shared",

testing/mozharness/configs/single_locale/win64.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "win64",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/win64/l10n-mozconfig",
+    "app_name": "browser",
+    "mozconfig_platform": "win64",
+    "mozconfig_variant": "l10n-mozconfig",
     "ssh_key_dir": "~/.ssh",
     "objdir": "obj-firefox",
     "vcs_share_base": "c:/builds/hg-shared",

testing/mozharness/configs/single_locale/win64_devedition.py

@@ -1,7 +1,9 @@
 config = {
     "platform": "win64",
     "stage_product": "firefox",
-    "mozconfig": "src/browser/config/mozconfigs/win64/l10n-mozconfig-devedition",
+    "app_name": "browser",
+    "mozconfig_platform": "win64",
+    "mozconfig_variant": "l10n-mozconfig-devedition",
     "ssh_key_dir": "~/.ssh",
     "objdir": "obj-firefox",
     "vcs_share_base": "c:/builds/hg-shared",

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -235,7 +235,7 @@ class MozconfigPathError(Exception):
     There was an error getting a mozconfig path from a mozharness config.
     """
 
-def _get_mozconfig_path(script, config, dirs):
+def get_mozconfig_path(script, config, dirs):
     """
     Get the path to the mozconfig file to use from a mozharness config.
 
@@ -1127,7 +1127,7 @@ or run without that action (ie: --no-{action})"
         dirs = self.query_abs_dirs()
 
         try:
-            abs_mozconfig_path = _get_mozconfig_path(
+            abs_mozconfig_path = get_mozconfig_path(
                 script=self, config=self.config, dirs=dirs)
         except MozconfigPathError as e:
             self.fatal(e.message)

testing/mozharness/scripts/desktop_l10n.py

@@ -25,7 +25,10 @@ from mozharness.base.transfer import TransferMixin
 from mozharness.base.vcs.vcsbase import VCSMixin
 from mozharness.mozilla.buildbot import BuildbotMixin
 from mozharness.mozilla.purge import PurgeMixin
-from mozharness.mozilla.building.buildbase import MakeUploadOutputParser
+from mozharness.mozilla.building.buildbase import (
+    MakeUploadOutputParser,
+    get_mozconfig_path,
+)
 from mozharness.mozilla.l10n.locales import LocalesMixin
 from mozharness.mozilla.mar import MarMixin
 from mozharness.mozilla.mock import MockMixin
@@ -691,8 +694,7 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
         """
         config = self.config
         dirs = self.query_abs_dirs()
-        mozconfig = config['mozconfig']
+        src = get_mozconfig_path(self, config, dirs)
-        src = os.path.join(dirs['abs_work_dir'], mozconfig)
         dst = os.path.join(dirs['abs_mozilla_dir'], '.mozconfig')
         self.copyfile(src, dst)
         self.read_from_file(dst, verbose=True)
@@ -917,6 +919,7 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
             abs_dirs[directory] = value
         dirs = {}
         dirs['abs_tools_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'tools')
+        dirs['abs_src_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'src')
         for key in dirs.keys():
             if key not in abs_dirs:
                 abs_dirs[key] = dirs[key]

testing/mozharness/test/test_mozilla_building_buildbase.py

@@ -3,7 +3,7 @@ import unittest
 from mozharness.base.log import LogMixin
 from mozharness.base.script import ScriptMixin
 from mozharness.mozilla.building.buildbase import (
-    _get_mozconfig_path, MozconfigPathError,
+    get_mozconfig_path, MozconfigPathError,
 )
 
 
@@ -20,7 +20,7 @@ class FakeScriptMixin(LogMixin, ScriptMixin, object):
 
 class TestMozconfigPath(unittest.TestCase):
     """
-    Tests for :func:`_get_mozconfig_path`.
+    Tests for :func:`get_mozconfig_path`.
     """
 
     def test_path(self):
@@ -29,7 +29,7 @@ class TestMozconfigPath(unittest.TestCase):
         """
         script = FakeScriptMixin()
 
-        abs_src_path = _get_mozconfig_path(
+        abs_src_path = get_mozconfig_path(
             script, config={'src_mozconfig': "path/to/mozconfig"},
             dirs={"abs_src_dir": "/src"},
         )
@@ -48,7 +48,7 @@ class TestMozconfigPath(unittest.TestCase):
             'mozconfig_variant': 'variant',
             'mozconfig_platform': 'platform9000',
         }
-        abs_src_path = _get_mozconfig_path(
+        abs_src_path = get_mozconfig_path(
             script, config=config,
             dirs={"abs_src_dir": "/src"},
         )
@@ -69,7 +69,7 @@ class TestMozconfigPath(unittest.TestCase):
         config = {
             'src_mozconfig_manifest': "helper_files/mozconfig_manifest.json"
         }
-        abs_src_path = _get_mozconfig_path(
+        abs_src_path = get_mozconfig_path(
             script, config=config,
             dirs={
                 "abs_src_dir": "/src",
@@ -117,4 +117,4 @@ class TestMozconfigPath(unittest.TestCase):
 
         for config in configs:
             with self.assertRaises(MozconfigPathError):
-                _get_mozconfig_path(script, config=config, dirs={})
+                get_mozconfig_path(script, config=config, dirs={})