Bug 1466222 - Don't allow mar_tools_url to be runtime configured. r=catlee
☠☠ backed out by 6d83f12c21d3 ☠ ☠
authorJustin Wood <Callek@gmail.com>
Tue, 05 Jun 2018 20:47:38 -0400
changeset 475894 185a82778d94271ed27b60f333e78859bc09605f
parent 475893 18fe0eb0545cfa2b5809289dbd34e00841a5f41e
child 475895 7bb7694f5d5d78ae85291b22fff313e9d8e42eb1
push id9374
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:43:20 +0000
treeherdermozilla-beta@160e085dfb0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee
bugs1466222
milestone62.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 1466222 - Don't allow mar_tools_url to be runtime configured. r=catlee for "Cleanup l10n mozharness config files." (Batch 2) Differential Revision: https://phabricator.services.mozilla.com/D1563
testing/mozharness/mozharness/mozilla/mar.py
testing/mozharness/scripts/desktop_l10n.py
--- a/testing/mozharness/mozharness/mozilla/mar.py
+++ b/testing/mozharness/mozharness/mozilla/mar.py
@@ -18,19 +18,17 @@ class MarMixin(object):
 
     def download_mar_tools(self):
         """downloads mar tools executables (mar,mbsdiff)
            and stores them local_dir()"""
         self.info("getting mar tools")
         dst_dir = self._mar_tool_dir()
         self.mkdir_p(dst_dir)
         config = self.config
-        replace_dict = {'platform': config['platform'],
-                        'branch': config['branch']}
-        url = config['mar_tools_url'] % replace_dict
+        url = config['mar_tools_url']
         binaries = (config['mar'], config['mbsdiff'])
         for binary in binaries:
             from_url = "/".join((url, binary))
             full_path = os.path.join(dst_dir, binary)
             if not os.path.exists(full_path):
                 self.download_file(from_url, file_name=full_path)
                 self.info("downloaded %s" % full_path)
             else:
--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -48,17 +48,17 @@ FAILURE_STR = "Failed"
 configuration_tokens = ('branch',
                         'platform',
                         'update_channel',
                         )
 # some other values such as "%(version)s", ...
 # are defined at run time and they cannot be enforced in the _pre_config_lock
 # phase
 runtime_config_tokens = ('version', 'locale', 'abs_objdir', 'revision',
-                         'en_us_installer_binary_url', 'mar_tools_url')
+                         'en_us_installer_binary_url')
 
 
 # DesktopSingleLocale {{{1
 class DesktopSingleLocale(LocalesMixin, AutomationMixin,
                           VCSMixin, BaseScript, MarMixin):
     """Manages desktop repacks"""
     config_options = [[
         ['--locale', ],