X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/3d81f14142b8b4e1216a8bfe54166c901fea5412..9394c848bfeff3ef4da19e950a238f2229498d83:/build-hooks/post-build

diff --git a/build-hooks/post-build b/build-hooks/post-build
index 277f8f2..60a5ab3 100755
--- a/build-hooks/post-build
+++ b/build-hooks/post-build
@@ -16,12 +16,13 @@ To configure zephyr, add something like the following to your invirt config:
 build:
  hooks:
   post_build:
-   zephyr: &post_build_zepyhr
+   zephyr: &post_build_zephyr
     class: myclass [required]
     instance: myinstance [optional]
     zsig: myzsig [optional]
   failed_build:
    zephyr: *post_build_zephyr
+  ...
 
 == mail ==
 
@@ -36,10 +37,18 @@ build:
     subject: My Subject [optional]
   failed_build:
    mail: *post_build_mail
-
-post_build values will be used when this script is invoked as
-post-build, while failed_build values will be used when it is invoked
-as failed-build.
+  ...
+
+The script chooses which configuration option to use based off the
+name it is called with.  This name also determines which command-line
+arguments the script takes, as well as how they are formatted.  When
+called as:
+
+post-build: uses post_build option
+failed-build: uses failed_build option
+post-submit: uses post_submit option
+failed-submit: uses failed_submit option
+post-add-repo: uses post_add_repo option
 """
 
 import optparse
@@ -57,23 +66,25 @@ def build_completion_msg(succeeded, values, verbose=True, success=lambda x: x, f
     """Format a message reporting the results of a build"""
     values = dict(values)
     if not verbose and values['traceback'] is not None:
-        # TODO: better heuristic
-        values['traceback'] = textwrap.fill('\n'.join(values['traceback'].split('\n')[-2:]))
+        split = values['traceback'].split('\n')
+        # Here, have a hackish heuristic
+        truncated = '(empty)'
+        for i in xrange(2, len(split)):
+            truncated = textwrap.fill('\n'.join(split[-i:]))
+            if len(truncated) >= 10:
+                break
+        values['traceback'] = truncated
 
     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)s in %(pocket)s %(result)s while %(failed_stage)s.
-
-%(traceback)s
-
-(Build %(build_id)s was submitted by %(principal)s at %(inserted_at)s.)""" % values
+        msg = """Build of %(package)s version %(version)s in %(pocket)s %(result)s while %(failed_stage)s.
+Job submitted by %(principal)s at %(inserted_at)s.
+Error: %(traceback)s""" % values
     return msg
 
 def submit_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x):
@@ -169,7 +180,7 @@ def main():
                    '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