Add changelog entry with my recent changes

[invirt/packages/invirt-dev.git] / build-hooks / post-build

diff --git a/build-hooks/post-build b/build-hooks/post-build
index 60a5ab3..2e5aa7d 100755 (executable)
--- a/build-hooks/post-build
+++ b/build-hooks/post-build
@@ -62,7 +62,8 @@ from email.mime import text
 from invirt import common, database, builder
 from invirt.config import structs as config
 
-def build_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x):
+def build_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x,
+                         escape=lambda x: x):
     """Format a message reporting the results of a build"""
     values = dict(values)
     if not verbose and values['traceback'] is not None:
@@ -75,6 +76,9 @@ def build_completion_msg(succeeded, values, verbose=True, success=lambda x: x, f
                 break
         values['traceback'] = truncated
 
+    for key in ['package', 'version', 'pocket', 'principal', 'inserted_at', 'short_commit']:
+        values[key] = escape(values[key])
+
     if succeeded:
         values['result'] = success(values['result'])
         msg = """Build of %(package)s %(version)s in %(pocket)s %(result)s.
@@ -87,28 +91,46 @@ 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):
+def submit_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x,
+                          escape=lambda x: x):
     values = dict(values)
     if succeeded:
         values['result'] = success(values['result'])
+        values['_extra'] = ''
     else:
         values['result'] = failure(values['result'])
-    msg = """Submission of %(commit)s to be built in %(pocket)s %(result)s.
-Build submitted by %(principal)s.""" % values
+        values['_extra'] = '\nError: %s' % escape(sys.stdin.read())
+    for key in ['commit', 'pocket', 'principal']:
+        values[key] = escape(values[key])
+    msg = """Submission of %(commit)s (%(package)s) to be built in %(pocket)s %(result)s.
+Build submitted by %(principal)s.%(_extra)s""" % values
     return msg
 
-def repo_creation_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x):
+def repo_creation_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x,
+                      escape=lambda x: x):
     values = dict(values)
     assert succeeded
+    for key in ['category', 'name', 'principal']:
+        values[key] = escape(values[key])
     msg = '%(principal)s just created a new repository, %(category)s/%(name)s.git' % values
     return msg
 
+def prebuild_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x,
+                 escape=lambda x: x):
+    for key in ['build_id', 'pocket', 'package', 'commit', 'principal', 'version', 'inserted_at']:
+        values[key] = escape(values[key])
+    msg = """Build started: %(package)s %(version)s in %(pocket)s.
+Base commit %(commit)s .
+Job submitted by %(principal)s at %(inserted_at)s.""" % values
+    return msg
+
 # Names of hooks
 POST_BUILD = 'post-build'
 FAILED_BUILD = 'failed-build'
 POST_SUBMIT = 'post-submit'
 FAILED_SUBMIT = 'failed-submit'
 POST_ADD_REPO = 'post-add-repo'
+PRE_BUILD = 'pre-build'
 
 # Types of communication
 
@@ -120,15 +142,18 @@ message_generators = {
                FAILED_BUILD : build_completion_msg,
                POST_SUBMIT : submit_completion_msg,
                FAILED_SUBMIT : submit_completion_msg,
-               POST_ADD_REPO : repo_creation_msg },
+               POST_ADD_REPO : repo_creation_msg,
+               PRE_BUILD : prebuild_msg },
     MAIL   : { POST_BUILD : build_completion_msg,
                FAILED_BUILD : build_completion_msg,
                POST_SUBMIT : submit_completion_msg,
                FAILED_SUBMIT : submit_completion_msg,
-               POST_ADD_REPO : repo_creation_msg }
+               POST_ADD_REPO : repo_creation_msg,
+               PRE_BUILD : prebuild_msg }
     }
 
 def zephyr_escape(m):
+    m = str(m)
     m = re.sub('@', '@@', m)
     m = re.sub('}', '@(})', m)
     return m
@@ -155,6 +180,8 @@ def main():
             hook_config = config.build.hooks.failed_submit
         elif prog == POST_ADD_REPO:
             hook_config = config.build.hooks.post_add_repo
+        elif prog == PRE_BUILD:
+            hook_config = config.build.hooks.pre_build
         else:
             parser.error('hook script invoked with unrecognized name %s' % prog)
             return 2
@@ -162,7 +189,7 @@ def main():
         print >>sys.stderr, 'No hook configuration found for %s.' % prog
         return 1
 
-    if prog in [POST_BUILD, FAILED_BUILD]:
+    if prog in [POST_BUILD, FAILED_BUILD, PRE_BUILD]:
         if len(args) != 1:
             parser.set_usage('Usage: %prog [options] build_id')
             parser.print_help()
@@ -181,8 +208,10 @@ def main():
                    'traceback' : build.traceback,
                    'version' : build.version,
                    'default_instance' : 'b%(build_id)s',
-                   'default_subject' : 'XVM build %(result)s: %(package)s %(version)s in %(pocket)s'}
-        if build.succeeded:
+                   'default_subject' : 'Build %(build_id)d %(result)s: %(package)s %(version)s in %(pocket)s'}
+        if prog == PRE_BUILD:
+            succeeded = True
+        elif build.succeeded:
             assert prog == POST_BUILD
             values['result'] = 'succeeded'
             succeeded = True
@@ -229,7 +258,8 @@ def main():
     else:
         make_msg = message_generators[ZEPHYR][prog]
         msg = '@{%s}' % make_msg(succeeded, values, verbose=False,
-                                 success=zephyr_success, failure=zephyr_failure)
+                                 success=zephyr_success, failure=zephyr_failure,
+                                 escape=zephyr_escape)
         instance = zephyr_config.get('instance', values['default_instance']) % values
         zsig = zephyr_config.get('zsig', 'XVM Buildbot') % values
         common.captureOutput(['zwrite', '-c', klass, '-i', instance, '-s',