rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve the email reporter.

Browse Source
This commit is contained in:
Chris Johns 2013-05-01 10:42:08 +10:00
parent c914e1d306
commit df56f7ee09
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source-builder/sb/setbuilder.py
View File

@ -62,7 +62,7 @@ class buildset:
self.bset_pkg = '%s-%s-set' % (self.macros.expand('%{_target}'), self.bset) self.bset_pkg = '%s-%s-set' % (self.macros.expand('%{_target}'), self.bset)
self.mail_header = '' self.mail_header = ''
self.mail_report = '' self.mail_report = ''
self.build_failed = False self.build_failure = None
def write_mail_header(self, text, prepend = False): def write_mail_header(self, text, prepend = False):
if len(text) == 0 or text[-1] != '\n' or text[-1] != '\r': if len(text) == 0 or text[-1] != '\n' or text[-1] != '\r':
@ -287,10 +287,7 @@ class buildset:
log.notice('Build Set: %s' % (self.bset)) log.notice('Build Set: %s' % (self.bset))
if self.opts.get_arg('--mail'): if self.opts.get_arg('--mail'):
mail_report_subject = \ mail_report_subject = '%s %s' % (self.bset, self.macros.expand('%{_host}'))
'%s %s (%s)' % (self.bset,
self.macros.expand('%{_host}'),
datetime.datetime.now().ctime())
configs = self.load() configs = self.load()
@ -300,6 +297,8 @@ class buildset:
start = datetime.datetime.now() start = datetime.datetime.now()
mail_report = False
try: try:
builds = [] builds = []
for s in range(0, len(configs)): for s in range(0, len(configs)):
@ -317,6 +316,7 @@ class buildset:
bs.build(deps) bs.build(deps)
del bs del bs
elif configs[s].endswith('.cfg'): elif configs[s].endswith('.cfg'):
mail_report = self.opts.get_arg('--mail')
log.trace('_bset: %s' % ('-' * 80)) log.trace('_bset: %s' % ('-' * 80))
b = build.build(configs[s], self.opts.get_arg('--pkg-tar-files'), b = build.build(configs[s], self.opts.get_arg('--pkg-tar-files'),
opts, macros) opts, macros)
@ -330,7 +330,8 @@ class buildset:
else: else:
raise error.general('invalid config type: %s' % (configs[s])) raise error.general('invalid config type: %s' % (configs[s]))
except error.general, gerr: except error.general, gerr:
self.build_failed = True if self.build_failure is None:
self.build_failure = b.name()
self.write_mail_header('') self.write_mail_header('')
self.write_mail_header('= ' * 40) self.write_mail_header('= ' * 40)
self.write_mail_header('Build FAILED: %s' % (b.name())) self.write_mail_header('Build FAILED: %s' % (b.name()))
@ -355,14 +356,19 @@ class buildset:
b.cleanup() b.cleanup()
for b in builds: for b in builds:
del b del b
except error.general, gerr:
raise
except KeyboardInterrupt:
mail_report = False
raise
except: except:
self.build_failed = True self.build_failure = 'RSB general failure'
raise raise
finally: finally:
end = datetime.datetime.now() end = datetime.datetime.now()
os.environ['PATH'] = current_path os.environ['PATH'] = current_path
build_time = str(end - start) build_time = str(end - start)
if self.opts.get_arg('--mail'): if mail_report:
to_addr = self.opts.get_arg('--mail-to') to_addr = self.opts.get_arg('--mail-to')
if to_addr is not None: if to_addr is not None:
to_addr = to_addr[1] to_addr = to_addr[1]
@ -372,13 +378,15 @@ class buildset:
self.write_mail_header('Build Time %s' % (build_time), True) self.write_mail_header('Build Time %s' % (build_time), True)
self.write_mail_header('') self.write_mail_header('')
m = mailer.mail(self.opts) m = mailer.mail(self.opts)
if self.build_failed: if self.build_failure is not None:
pass_fail = 'FAILED ' mail_report_subject = 'Build: FAILED %s (%s)' %\
(mail_report_subject, self.build_failure)
pass_fail = 'FAILED'
else: else:
pass_fail = '' mail_report_subject = 'Build: PASSED %s' % (mail_report_subject)
mail_report_subject = 'Build: %s%s' % (pass_fail, mail_report_subject)
if not self.opts.dry_run(): if not self.opts.dry_run():
m.send(to_addr, mail_report_subject, self.mail_header + self.mail_report) m.send(to_addr, mail_report_subject,
self.mail_header + self.mail_report)
log.notice('Build Set: Time %s' % (build_time)) log.notice('Build Set: Time %s' % (build_time))
def list_bset_cfg_files(opts, configs): def list_bset_cfg_files(opts, configs):