mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
Bug 1380777 - Override EN_US_INSTALLER_BINARY_URL via buldbot properties r=Callek DONTBUILD
MozReview-Commit-ID: FGdUVf3k6fF --HG-- extra : rebase_source : 0fa740eaa36ac0df6ec834a178bb1a0966cfd201
This commit is contained in:
parent
7cedd07c27
commit
480ba2f219
@ -60,15 +60,17 @@ configuration_tokens = ('branch',
|
||||
'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,
|
||||
@ -368,6 +370,12 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user