Bug 1185666 - Fix l10n repack scripts and config to support OSX on Linux. r=aki draft
authorJustin Wood <Callek@gmail.com>
Fri, 16 Dec 2016 15:44:58 -0500
changeset 553837 e8a685345f23d42e2b50271502f598d85d6810f6
parent 553836 2eaad4d90870ea917f55f2161f93428e81eb3b40
child 553838 323b54ef7f721cee6f306079ac1701db0ffb34b3
push id51792
push userCallek@gmail.com
push dateThu, 30 Mar 2017 20:30:25 +0000
reviewersaki
bugs1185666
milestone55.0a1
Bug 1185666 - Fix l10n repack scripts and config to support OSX on Linux. r=aki MozReview-Commit-ID: B8DLjeRijs
testing/mozharness/configs/single_locale/tc_macosx64.py
testing/mozharness/scripts/desktop_l10n.py
--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -17,11 +17,14 @@ config = {
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
     },
     "upload_env": {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': '/home/worker/artifacts/',
     },
+
+    "tooltool_url": 'http://relengapi/tooltool/',
+    'tooltool_manifest_src': "browser/config/tooltool-manifests/macosx64/cross-releng.manifest",
     "mozilla_dir": "src/",
     "simple_name_move": True,
 }
--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -813,17 +813,18 @@ class DesktopSingleLocale(LocalesMixin, 
             # Assume an UPLOAD PATH
             upload_target = self.config["upload_env"]["UPLOAD_PATH"]
             target_path = os.path.join(upload_target, locale)
             self.mkdir_p(target_path)
             glob_name = "*.%s.*" % locale
             matches = (glob.glob(os.path.join(upload_target, glob_name)) +
                        glob.glob(os.path.join(upload_target, 'update', glob_name)) +
                        glob.glob(os.path.join(upload_target, '*', 'xpi', glob_name)))
-            targets_exts = ["tar.bz2", "langpack.xpi", "complete.mar", "checksums"]
+            targets_exts = ["tar.bz2", "dmg", "langpack.xpi",
+                            "complete.mar", "checksums"]
             targets = ["target.%s" % ext for ext in targets_exts]
             for f in matches:
                 target_file = next(target_file for target_file in targets
                                     if f.endswith(target_file[6:]))
                 if target_file:
                     # Remove from list of available options for this locale
                     targets.remove(target_file)
                 else: