Merge lp:~1chb1n/ubuntu-openstack-ci/mpc-pb into lp:ubuntu-openstack-ci

[Ryan Beisner]

add pastebin posting of test log, reduce mp comment length

[lp:~1chb1n/ubuntu-openstack-ci/mpc-pb]

41. By Ryan Beisner on 2014-10-20

toggle sandbox off

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'common/osci_utils.py'
--- common/osci_utils.py	2014-10-16 21:53:26 +0000
+++ common/osci_utils.py	2014-10-20 19:29:22 +0000
@@ -10,6 +10,7 @@
 import random
 import string
 import distro_info
+import subprocess
 from jinja2 import Environment, FileSystemLoader
 from launchpadlib.launchpad import Launchpad
 
@@ -424,3 +425,19 @@
     if new_status:
         mp.setStatus(status=new_status)
     mp.lp_save()
+
+
+def pb_it(file_name):
+    '''pastebin a filename, return pastebin url
+    '''
+    if os.path.isfile(file_name):
+        pb_url = subprocess.Popen(['pastebinit', file_name],
+                                  stdout=subprocess.PIPE).stdout
+        pb_line = pb_url.readline().rstrip()
+        if pb_line[:4] == 'http':
+            return pb_line
+        else:
+            return 'pastebin not avail., cmd error'
+    else:
+        logging.error('file not found: {}'.format(file_name))
+        return 'pastebin not avail., file error'

=== modified file 'mp_comment.py'
--- mp_comment.py	2014-10-20 15:26:48 +0000
+++ mp_comment.py	2014-10-20 19:29:22 +0000
@@ -131,6 +131,7 @@
     logging.info('Constructing results blurb')
     summary = []
     results = []
+    pbs = {}
     something_ran = False
     for trigger_test, tt_attrs in conf_map['mp-trigger-tests'].iteritems():
         # look for try touchfiles
@@ -156,12 +157,17 @@
             logging.info('Found {} results file(s)'.format(trigger_test))
             # handle results files
             for res_file in res_files:
+                pbs[res_file] = osci_utils.pb_it(res_file)
+                logging.debug('pb for {}: {}'.format(res_file, pbs[res_file]))
                 llimit = conf_map['mp-conf']['line-limit']
                 _line = ('\n{} Results (max last {} lines) from \n{}:'.format(
                     trigger_test.upper(), llimit, res_file))
                 results.append(_line)
                 with open(res_file) as _file:
                     res_lines = [f_line.rstrip() for f_line in _file][-llimit:]
+                _line = ('Full {} result: {}'.format(trigger_test,
+                                                     pbs[res_file]))
+                res_lines.append(_line)
                 results.extend(res_lines)
         else:
             _line = ('\n{} Results not found.'.format(trigger_test.upper()))
@@ -192,15 +198,16 @@
             _line = ('    {} OK:  believed to pass, but you should '
                      'confirm results'.format(trigger_test.upper()))
             summary.append(_line)
+#
+    logging.debug('pbs: {}'.format(pbs))
 
     if not something_ran:
         logging.error('It appears that nothing ran here.')
         sys.exit(1)
 
     # add summary and results to context for template
-    contexts[0]['results_summary'] = '\n'.join(summary)
-    contexts[0]['results_summary'] += '\n'
-    contexts[0]['results_summary'] += '\n'.join(results)
+    contexts[0]['summary'] = '\n'.join(summary)
+    contexts[0]['results'] = '\n'.join(results)
 
     # create mp comment file
     logging.info('Creating mp-comment file')

=== modified file 'populate/mappings.yaml'
--- populate/mappings.yaml	2014-10-20 15:26:48 +0000
+++ populate/mappings.yaml	2014-10-20 19:29:22 +0000
@@ -14,7 +14,7 @@
   mp-state-file: 'mp-state'
 
 mp-conf:
-  line-limit: 12
+  line-limit: 4
 # post ALL MP comments to this alternate MP when mp-comment-sandbox is True
 # ie. contain the noise during osci dev
   mp-comment-sandbox: False

=== modified file 'populate/mp-comment.tmpl'
--- populate/mp-comment.tmpl	2014-10-20 15:26:48 +0000
+++ populate/mp-comment.tmpl	2014-10-20 19:29:22 +0000
@@ -1,11 +1,9 @@
 UOSCI bot says:  This MP triggered a test on the Ubuntu OSCI system.
 
 {{JOB_NAME}} {{BUILD_DISPLAY_NAME}}
+{{summary}}
+
 Build:  {{BUILD_URL}}
 MP:  {{MP_TRIGGER}}
 Proposed:  {{MP_SRC_BR}}
-
-Results summary:
-{{results_summary}}
-----------
-{{JENKINS_URL}} is currently in development on a private network, though public results are planned.
+{{results}}