--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -55,25 +55,27 @@ FAILURE_STR = "Failed"
# it's a list of values that are already known before starting a build
configuration_tokens = ('branch',
'platform',
'update_platform',
'update_channel',
'ssh_key_dir',
'stage_product',
'upload_environment',
- )
+ )
# some other values such as "%(version)s", "%(buildid)s", ...
# are defined at run time and they cannot be enforced in the _pre_config_lock
# phase
runtime_config_tokens = ('buildid', 'version', 'locale', 'from_buildid',
'abs_objdir', 'abs_merge_dir', 'revision',
- 'to_buildid', 'en_us_binary_url', 'mar_tools_url',
+ 'to_buildid', 'en_us_binary_url',
+ 'en_us_installer_binary_url', 'mar_tools_url',
'post_upload_extra', 'who')
+
# DesktopSingleLocale {{{1
class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
VCSMixin, SigningMixin, PurgeMixin, BaseScript,
BalrogMixin, MarMixin, VirtualenvMixin, TransferMixin):
"""Manages desktop repacks"""
config_options = [[
['--balrog-config', ],
{"action": "extend",
@@ -363,16 +365,22 @@ class DesktopSingleLocale(LocalesMixin,
# Override en_us_binary_url if passed as a buildbot property
if self.buildbot_config["properties"].get("en_us_binary_url"):
self.info("Overriding en_us_binary_url with %s" %
self.buildbot_config["properties"]["en_us_binary_url"])
replace_dict['en_us_binary_url'] = \
str(self.buildbot_config["properties"]["en_us_binary_url"])
bootstrap_env = self.query_env(partial_env=config.get("bootstrap_env"),
replace_dict=replace_dict)
+ # Override en_us_installer_binary_url if passed as a buildbot property
+ if self.buildbot_config["properties"].get("en_us_installer_binary_url"):
+ self.info("Overriding en_us_binary_url with %s" %
+ self.buildbot_config["properties"]["en_us_installer_binary_url"])
+ bootstrap_env['EN_US_INSTALLER_BINARY_URL'] = str(
+ self.buildbot_config["properties"]["en_us_installer_binary_url"])
if 'MOZ_SIGNING_SERVERS' in os.environ:
sign_cmd = self.query_moz_sign_cmd(formats=None)
sign_cmd = subprocess.list2cmdline(sign_cmd)
# windows fix
bootstrap_env['MOZ_SIGN_CMD'] = sign_cmd.replace('\\', '\\\\\\\\')
for binary in self._mar_binaries():
# "mar -> MAR" and 'mar.exe -> MAR' (windows)
name = binary.replace('.exe', '')