if succeeded:
values['result'] = success(values['result'])
msg = """Build of %(package)s %(version)s in %(pocket)s %(result)s.
-
-Branch %(pocket)s has been advanced to %(short_commit)s.
-
-(Build %(build_id)s was submitted by %(principal)s at %(inserted_at)s.)""" % values
+Job submitted by %(principal)s at %(inserted_at)s.
+Branch %(pocket)s has been advanced to %(short_commit)s.""" % values
else:
values['result'] = failure(values['result'])
msg = """Build of %(package)s version %(version)s in %(pocket)s %(result)s while %(failed_stage)s.
'short_commit' : short_commit,
'traceback' : build.traceback,
'version' : build.version,
- 'default_instance' : 'build_%(build_id)s',
+ 'default_instance' : 'b%(build_id)s',
'default_subject' : 'XVM build %(result)s: %(package)s %(version)s in %(pocket)s'}
if build.succeeded:
assert prog == POST_BUILD