зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1305720 - Check for --artifact try syntax regardless of is_automation value; r=armenzg
Check try message for --artifact even if fx_desktop_build.py is run with --skip-buildbot-actions We can't rely on buildbot config. Add checks to TryToolsMixin._extract_try_message so that it works even if self.buildbot_config is None. MozReview-Commit-ID: 1xErjuOArBe --HG-- extra : rebase_source : 2f3204b37e67fd9a77dbff0fa93ab894b08181c1
This commit is contained in:
Родитель
90f5226666
Коммит
7cd9774674
|
@ -76,19 +76,20 @@ class TryToolsMixin(TransferMixin):
|
|||
|
||||
def _extract_try_message(self):
|
||||
msg = None
|
||||
buildbot_config = self.buildbot_config or {}
|
||||
if "try_message" in self.config and self.config["try_message"]:
|
||||
msg = self.config["try_message"]
|
||||
elif 'TRY_COMMIT_MSG' in os.environ:
|
||||
msg = os.environ['TRY_COMMIT_MSG']
|
||||
elif self._is_try():
|
||||
if self.buildbot_config['sourcestamp']['changes']:
|
||||
msg = self.buildbot_config['sourcestamp']['changes'][-1]['comments']
|
||||
if 'sourcestamp' in buildbot_config and buildbot_config['sourcestamp'].get('changes'):
|
||||
msg = buildbot_config['sourcestamp']['changes'][-1].get('comments')
|
||||
|
||||
if msg is None or len(msg) == 1024:
|
||||
# This commit message was potentially truncated or not available in
|
||||
# buildbot_config (e.g. if running in TaskCluster), get the full message
|
||||
# from hg.
|
||||
props = self.buildbot_config['properties']
|
||||
props = buildbot_config.get('properties', {})
|
||||
repo_url = 'https://hg.mozilla.org/%s/'
|
||||
if 'revision' in props and 'repo_path' in props:
|
||||
rev = props['revision']
|
||||
|
@ -112,10 +113,10 @@ class TryToolsMixin(TransferMixin):
|
|||
if isinstance(v, dict) and 'changesets' in v:
|
||||
msg = v['changesets'][-1]['desc']
|
||||
|
||||
if not msg and 'try_syntax' in self.buildbot_config['properties']:
|
||||
if not msg and 'try_syntax' in buildbot_config.get('properties', {}):
|
||||
# If we don't find try syntax in the usual place, check for it in an
|
||||
# alternate property available to tools using self-serve.
|
||||
msg = self.buildbot_config['properties']['try_syntax']
|
||||
msg = buildbot_config['properties']['try_syntax']
|
||||
if not msg:
|
||||
self.warning('Try message not found.')
|
||||
return msg
|
||||
|
|
|
@ -124,9 +124,9 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object):
|
|||
else:
|
||||
self.fatal("'stage_platform' not determined and is required in your config")
|
||||
|
||||
if self.try_message_has_flag('artifact'):
|
||||
self.info('Artifact build requested in try syntax.')
|
||||
self._update_build_variant(rw_config)
|
||||
if self.try_message_has_flag('artifact'):
|
||||
self.info('Artifact build requested in try syntax.')
|
||||
self._update_build_variant(rw_config)
|
||||
|
||||
# helpers
|
||||
def _update_build_variant(self, rw_config, variant='artifact'):
|
||||
|
|
Загрузка…
Ссылка в новой задаче