Merge lp:~asbalderson/jenkins-launchpad-plugin/templating into lp:jenkins-launchpad-plugin

[Alexander Balderson]

Adjust messaging to launchpad to use jinja2 templates.

Enable a user to customize the messages sent to launchpad based on results.
Adds the run requirement of Jinja2

Generally this change allowed for removing a big portion of code that was creating text and allowed for some simplification and reuse.

[lp:~asbalderson/jenkins-launchpad-plugin/templating]

162. By Alexander Balderson on 2019-05-07

add new lines to end of templates
add unit tests for voteOnMergeProposal

163. By Alexander Balderson on 2019-05-09

fix unit tests, add readme

=== modified file 'HACKING'
--- HACKING	2018-03-07 09:21:26 +0000
+++ HACKING	2019-05-09 18:32:44 +0000
@@ -4,7 +4,7 @@
 
 
 You need the following if you want to make changes/run this project:
-    * sudo apt-get install -y python-launchpadlib python-bzrlib python-mock python-testtools python-jenkins python-lockfile python-testscenarios python-pyruntest python-yaml python-git
+    * sudo apt-get install -y python-launchpadlib python-bzrlib python-mock python-testtools python-jenkins python-lockfile python-testscenarios python-pyruntest python-yaml python-git python-jinja2
     * install tarmac:
         bzr branch lp:tarmac
         cd tarmac
 
=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2019-05-09 18:32:44 +0000
@@ -0,0 +1,1 @@
+include templates/*.j2
 \ No newline at end of file
 
=== modified file 'README'
--- README	2013-05-20 11:47:35 +0000
+++ README	2019-05-09 18:32:44 +0000
@@ -7,3 +7,36 @@
 
 See also /usr/share/doc/jenkins-launchpad-plugin/html/index.html for 
 more info.
+
+# TEMPLATING
+
+Jenkins Launchpad Plugin commands voteOnMergeProposal and autoland both
+support using custom templates for the messages sent to launchpad.  The 
+message templates imported using jinja2.  See http://jinja.pocoo.org/docs/2.10/templates/
+for more information.
+
+When using custom templating, the user only needs to update the 
+templates with messages they wish to change; the defaults will be
+used in all other cases.
+
+When working with custom templates, it's recommended that the user starts with
+a default template and makes the changes they wish to see.
+
+## Arguments
+
+The arguments are loaded into a dictionary called "args" so all calls need
+to be prefixed with "args."
+
+`result` defines the result from the tests, usually passed in as an argument
+to the script, "PASSED" or "FAILED"
+`revision` defines the git or bzr revision being reviewed.
+`build_url` defines the URL for the build being run. it can be used to generate
+the rebuild URL.
+`merge_url` defines the URL to the merge request being reviewed.
+`coverity_artifacts` defines artifcats built during tests run for this revision.
+It is either None or a list of artificats.
+`executed_tests` defines tests run against this propsal.  It is a list of
+dictionaries, where each dictionary defines 3 values:
+    `deb` defines list of jenkins urls for debs generated from the test.
+    `output` defines the jenkins url for the executed test.
+    `result` defines the result of that particular build job reported by jenkins.
 
=== modified file 'jlp/__init__.py'
--- jlp/__init__.py	2015-12-14 04:36:05 +0000
+++ jlp/__init__.py	2019-05-09 18:32:44 +0000
@@ -11,6 +11,7 @@
 __version__ = '0.1'
 __author__ = 'Martin Mrazik'
 
+import jinja2
 import yaml
 import os
 import logging
@@ -85,6 +86,17 @@
     stdout_handler.setLevel(log_level)
 
 
+def get_jinja_environment(extra_dir=None):
+    default_templates = '/'.join(__file__.split('/')[0:-2]) + '/templates'
+    templates = [default_templates]
+    if extra_dir:
+        # we load the arg templates first
+        # then add in any missing templates from the defaults
+        templates.insert(0, extra_dir)
+    loader = jinja2.FileSystemLoader(templates)
+    env = jinja2.Environment(loader=loader)
+    return env
+
 set_log_level(logger, stdout_handler)
 
 
 
=== modified file 'jlp/commands/autoland.py'
--- jlp/commands/autoland.py	2019-03-15 16:18:36 +0000
+++ jlp/commands/autoland.py	2019-05-09 18:32:44 +0000
@@ -3,12 +3,12 @@
 import argparse
 import atexit
 import git
-from jlp.launchpadutils import (build_state, LaunchpadVote, get_vote_subject,
+from jlp.launchpadutils import (LaunchpadVote, get_vote_subject,
                                 get_target_branch, get_source_branch,
                                 is_git_project)
 from jlp import (launchpadutils, Branch,
                  DputRunner, jenkinsutils, get_launchpad,
-                 get_config_option, logger)
+                 get_config_option, logger, get_jinja_environment)
 from tarmac.exceptions import TarmacMergeError, BranchHasConflicts
 from bzrlib.errors import LockFailed
 import os
@@ -74,23 +74,30 @@
     return formatted_message
 
 
-def change_mp_status(mp, reason, args, vote):
-    args[reason] = True
-    mp_state, message = build_state(args)
-    message = jenkinsutils.format_message_for_mp_update(
+def change_mp_status(mp, template, args, vote):
+    if template != 'merged.j2':
+        args['test_result'] = 'FAILED'
+    env = get_jinja_environment(args['template_dir'])
+    real_template = env.get_template(template)
+    template_args = launchpadutils.get_template_args(
+        args['test_result'],
+        args['revision'],
         args['build_job_url'],
-        message,
-        include_rebuild_link=False)
-    launchpadutils.change_mp_status(mp, mp_state, message, args['revision'],
-                                    vote)
-
+        args['merge_proposal'])
+    msg = real_template.render(args=template_args)
+    launchpadutils.report_to_launchpad(
+            mp,
+            msg,
+            args['revision'],
+            vote=vote
+        )
 
 def merge_and_commit(mp, args, lp_handle):
     # if there is no reviewed_revid then something went wrong
     if not mp.reviewed_revid:
         logger.debug('Approved revid is not set '
                      '(maybe a permission problem?). Failing autolanding.')
-        change_mp_status(mp, 'invalid_revid',
+        change_mp_status(mp, 'invalid_revid.j2',
                          args, LaunchpadVote.NEEDS_FIXING)
         return 1
 
@@ -196,7 +203,7 @@
     if source_revid != mp.reviewed_revid:
         logger.debug('Unapproved changes made after approval. '
                      'Failing autolanding.')
-        change_mp_status(mp, 'unapproved_changes',
+        change_mp_status(mp, 'unapproved_changes.j2',
                          args, LaunchpadVote.NEEDS_FIXING)
         return 1
 
@@ -223,11 +230,13 @@
     # Lint the commit message
     message, errors = lint_commit_message(message)
     if errors:
-        error_msg = 'Commit message lints:\n - ' + ' - '.join(errors)
-        logger.debug(error_msg)
+        env = get_jinja_environment(args['template_dir'])
+        real_template = env.get_template('invalid_commit_message.j2')
+        msg = real_template.render(errors=errors)
+        logger.debug(msg)
         mp.createComment(
             subject='Invalid Commit Message',
-            content=error_msg,
+            content=msg,
             vote=LaunchpadVote.NEEDS_FIXING
         )
         mp.setStatus(status='Needs review', revid=mp.reviewed_revid)
@@ -245,7 +254,6 @@
     target.git.push()
 
     logger.debug('New revision is: %s' % target.head.object.hexsha)
-
     mp.setStatus(status='Merged')
 
     logger.debug('Closing bugs')
@@ -271,7 +279,7 @@
     if source.bzr_branch.revno() > approved:
         logger.debug('Unapproved changes made after approval. '
                      'Failing autolanding.')
-        change_mp_status(mp, 'unapproved_changes',
+        change_mp_status(mp, 'unapproved_changes.j2',
                          args, LaunchpadVote.NEEDS_FIXING)
         return 1
 
@@ -322,18 +330,19 @@
             return 1
     except BranchHasConflicts:
         logger.info('Merging failed - branch has conflicts')
-        change_mp_status(mp, 'merge_failed', args,
+
+        change_mp_status(mp, 'merge_failed.j2', args,
                          LaunchpadVote.NEEDS_FIXING)
         return 1
     except TarmacMergeError:
         logger.info('Landing failed')
-        change_mp_status(mp, 'landing_failed', args,
+        change_mp_status(mp, 'landing_failed.j2', args,
                          LaunchpadVote.NEEDS_FIXING)
         return 1
     except LockFailed:
         logger.info('Bazaar error: LockFailed. Jenkins user is maybe not ' +
                     'allowed to push into target?')
-        change_mp_status(mp, 'landing_failed', args,
+        change_mp_status(mp, 'landing_failed.j2', args,
                          LaunchpadVote.NEEDS_FIXING)
         return 1
     finally:
@@ -397,6 +406,9 @@
                              "and don't modify the changlog in any other way")
     parser.add_argument('--disable-squash', action='store_true',
                         help='Disable squashing during a merge')
+    parser.add_argument('-t', '--template-dir',
+                        help='Optional directory of alternate jinja2 templates.',
+                        default=None)
 
     args = vars(parser.parse_args())
 
@@ -419,7 +431,7 @@
     #check for test_result and fail if previous testing failed
     if args['test_result'] == 'FAILED':
         logger.debug('Previous test failed. Failing autolanding.')
-        change_mp_status(mp, 'landing_failed', args,
+        change_mp_status(mp, 'landing_failed.j2', args,
                          LaunchpadVote.NEEDS_FIXING)
         return 0
 
@@ -429,7 +441,7 @@
     if not (launchpadutils.get_commit_message(
             mp, args['use_description_for_commit'])):
         logger.debug('Commit message empty. Failing autolanding.')
-        change_mp_status(mp, 'commit_message_empty',
+        change_mp_status(mp, 'commit_message_empty.j2',
                          args, LaunchpadVote.NEEDS_FIXING)
         return 1
 
 
=== modified file 'jlp/commands/voteOnMergeProposal.py'
--- jlp/commands/voteOnMergeProposal.py	2018-03-08 10:03:10 +0000
+++ jlp/commands/voteOnMergeProposal.py	2019-05-09 18:32:44 +0000
@@ -1,6 +1,7 @@
 from argparse import ArgumentParser
 import atexit
-from jlp import launchpadutils, get_launchpad, logger
+import jinja2
+from jlp import launchpadutils, get_launchpad, logger, get_config_option, get_jinja_environment
 import re
 import os
 from shutil import rmtree
@@ -19,6 +20,9 @@
                         help="URL of the merge proposal to update")
     parser.add_argument('-i', '--skip-message', action='store_true',
                         help="Skip checking if a commit message is set")
+    parser.add_argument('-t', '--template-dir',
+                        help='Optional directory of alternate jinja2 templates.',
+                        default=None)
     args = vars(parser.parse_args())
 
     # launchpadlib is not thread/process safe so we are creating launchpadlib
@@ -41,11 +45,10 @@
 
     # this is the status from tests
     overal_status = args['status']
-    # by default reason is empty as it is usually just a failed build
-    reason = ''
 
     #override the status to FAILED and set reason if no commit message is set
     match = re.match('^(.*)/job/([^/]*)/.*$', args['build_url'])
+    template = 'ci_test.j2'
     if args['skip_message']:
         logger.debug('Skipping check for empty commit message')
     elif match:
@@ -54,22 +57,34 @@
         if not launchpadutils.is_commit_message_set(mp,
                                                     jenkins_job, jenkins_url):
             overal_status = 'FAILED'
-            reason = "No commit message was specified in the merge " + \
-                     "proposal. Click on the following link and set the " + \
-                     "commit message (if you want a jenkins rebuild you " +\
-                     "need to trigger it yourself):\n" + \
-                     args['merge_proposal'] + "/+edit-commit-message\n"
+            template = 'no_commit.j2'
             logger.debug('Commit message not set. Failing CI.')
     else:
         logger.debug('Unable to get job name from build_url.' +
                      'Skipping check for empty commit message')
 
-    if overal_status == 'PASSED':
-        launchpadutils.approve_mp(mp, args['revision'], args['build_url'])
-    else:  # status == False corresponds to NOT 'PASSED'
-        launchpadutils.disapprove_mp(mp,
-                                     args['revision'],
-                                     args['build_url'],
-                                     reason)
+    template_args = launchpadutils.get_template_args(
+        overal_status,
+        args['revision'],
+        args['build_url'],
+        args['merge_proposal']
+    )
+    env = get_jinja_environment(args['template_dir'])
+    real_template = env.get_template(template)
+    msg = real_template.render(args=template_args)
+    if overal_status != 'PASSED':
+        launchpadutils.report_to_launchpad(
+            mp,
+            msg,
+            args['revision'],
+            vote=launchpadutils.LaunchpadVote.NEEDS_FIXING
+        )
+    else:
+        launchpadutils.report_to_launchpad(
+            mp,
+            msg,
+            args['revision'],
+            vote=launchpadutils.LaunchpadVote.APPROVE
+        )
 
     return 0
 
=== modified file 'jlp/jenkinsutils.py'
--- jlp/jenkinsutils.py	2018-06-28 19:31:20 +0000
+++ jlp/jenkinsutils.py	2019-05-09 18:32:44 +0000
@@ -8,7 +8,7 @@
 from textwrap import dedent
 from . import get_json_jenkins
 from lazr.restfulclient.errors import Unauthorized
-from jlp import logger, get_config_option
+from jlp import logger, get_config_option, get_jinja_environment
 
 
 def normalize_url(url):
@@ -492,7 +492,7 @@
        'url':
        'result':
        }
-           """
+    """
     return_data = []
 
     json_request = jenkins_url + job_name + '/' + str(build_number) +\
@@ -785,128 +785,6 @@
             content=message)
 
 
-def _get_result_line(result, url):
-    """Helper method for get_executed_test_runs_message.
-
-    Given a result and url it returns a string.
-    In case the result is failed it provides a link to console output:
-    FAILED: http://[...]/./distribution=quantal,flavor=amd64/267/console
-
-    In case the result is success or unstable (some tests failed) it provides
-    a link to the job:
-    SUCCESS: http://[...]/distribution=quantal,flavor=amd64/267
-
-    :param result: one of SUCCESS, UNSTABLE or FAILURE (comes from jenkins)
-    :param url: url of the build or configuration in case of matrix job
-    """
-
-    url = url.rstrip('/')
-    if result == 'SUCCESS' or result == 'UNSTABLE':
-        if url.endswith('console'):
-            # strip "/console"
-            url = url[:-8]
-    return "\n    {result}: {output}".format(
-        result=result,
-        output=url)
-
-
-def get_executed_test_runs_message(url):
-    """Return a string with executed runs for a given jenkins build url.
-
-    :param url: url with jenkins build
-
-    This is an example result of this function:
-    ----snip----
-Executed test runs:
-    FAILURE: http://[...]/./distribution=raring,flavor=amd64/3/console
-    FAILURE: http://[...]/./distribution=raring,flavor=i386/3/console
-    SUCCESS: http://[...]/job-freestyle/7
-        deb: http://[...]/job-freestyle/7/artifact/work/output/*zip*/output.zip
-    UNSTABLE: http://jenkins/job/freestyle-downstream/12
-Coverity artifacts:
-    http://[...]/artifact/results/coverity/CID_10895.html
-    http://[...]/results/coverity/CID_10896.html
-    http://[...]/results/coverity/CID_10895.html
-    http://[...]/results/coverity/CID_10896.html
-    ----snip----
-    """
-
-    ret = "\nExecuted test runs:"
-    jenkins = get_json_jenkins()
-    builds = get_executed_builds(jenkins, url)
-    coverity_artifacts = []
-    for build in builds:
-        ret += _get_result_line(
-            build['result'],
-            hide_jenkins_url(build['output']))
-        if build['output'].endswith('console'):
-            build_url = build['output'][:-len('console')]
-            artifacts = get_coverity_artifacts(jenkins, build_url)
-            debs = get_deb_artifacts(jenkins, build_url)
-            if debs:
-                ret += "\n        deb: {}".format(hide_jenkins_url(debs))
-            coverity_artifacts += artifacts
-    if coverity_artifacts:
-        ret += "\nCoverity artifacts:"
-        for artifact in coverity_artifacts:
-            ret += "\n    {}".format(hide_jenkins_url(artifact))
-
-    return ret
-
-
-def format_message_for_mp_update(build_url, message=None,
-                                 include_rebuild_link=True):
-    """Return a formatted message that is then posted as comment to the merge
-    proposal.
-
-    The message consists of:
-    * message
-    * executed test-runs (and links to artifacts such as deb files)
-    * rubuild link
-
-    :params build_url: jenkins url of the build in question
-    :params message: custom message (usually PASSED/FAILED)
-    :include_rebuild_link: boolean which affects the generation of rebuild link
-
-    Example:
-    ----snip----
-    PASSED: Continuous integration, rev:114
-    http://s-jenkins.ubuntu-ci:8080/job/jenkins-launchpad-plugin-ci/267/
-    Executed test runs:
-        SUCCESS: http://[...]/distribution=quantal,flavor=amd64/267
-
-    Click here to trigger a rebuild:
-    http://s-jenkins.ubuntu-ci:8080/job/jenkins-launchpad-plugin-ci/267/rebuild
-    ----snip----
-
-    """
-    formatted_message = dedent('''\
-            {message}{build_url}{executed_test_runs}
-            ''')
-    if include_rebuild_link:
-            formatted_message = formatted_message + dedent('''\
-
-            Click here to trigger a rebuild:
-            {rebuild_url}
-            ''')
-    if not message:
-        message = ''
-    if not build_url:
-        build_url = ''
-        executed_test_runs_message = ''
-    else:
-        executed_test_runs_message = \
-            get_executed_test_runs_message(build_url)
-
-    rebuild_url = '{build_url}/rebuild'.format(
-        build_url=build_url.rstrip('/'))
-    return formatted_message.format(
-        message=message,
-        build_url=hide_jenkins_url(build_url),
-        rebuild_url=hide_jenkins_url(rebuild_url),
-        executed_test_runs=executed_test_runs_message)
-
-
 def trigger_ci_build(lp_handle, mps, jenkins_job, jenkins_url):
     result = True
     launchpad_user = lp_handle.people(get_config_option('launchpad_login'))
@@ -952,13 +830,22 @@
                                                     jenkins_url):
             logger.debug('No commit message was set. Interrupting ' +
                          'autolanding for "%s".' % (mp.web_link))
-            mp_state, message = launchpadutils.build_state({
-                'commit_message_empty': True,
-                'merge_proposal': mp.web_link})
-            launchpadutils.change_mp_status(
-                mp, mp_state, message,
+            template_args = {
+                'result': 'FAILED',
+                'revision': mp.source_branch.revision_count,
+                'build_url': None,
+                'merge_url': mp.web_link
+            }
+            env = get_jinja_environment()
+            real_template = env.get_template('commit_message_empty.j2')
+            msg = real_template.render(args=template_args)
+            launchpadutils.report_to_launchpad(
+                mp,
+                msg,
                 mp.source_branch.revision_count,
-                launchpadutils.LaunchpadVote.NEEDS_FIXING)
+                status='Needs Review',
+                vote=launchpadutils.LaunchpadVote.NEEDS_FIXING
+            )
             continue
 
         if launchpadutils.unapproved_prerequisite_exists(mp):
 
=== modified file 'jlp/launchpadutils.py'
--- jlp/launchpadutils.py	2018-06-27 20:32:51 +0000
+++ jlp/launchpadutils.py	2019-05-09 18:32:44 +0000
@@ -1,4 +1,4 @@
-import re
+import os, re
 from jlp import logger, get_config_option
 import jenkinsutils
 from . import get_json_jenkins
@@ -70,27 +70,6 @@
     return None
 
 
-def change_mp_status(mp, status, message, revision, vote=None):
-    """Change status (vote) of merge proposal.
-
-    :param status: merge proposal status (e.g. "Needs review")
-    :param message: message for the vote
-    :param revision: revision against which this message is valid
-    :param vote: None or something from LaunchpadVote
-                 (e.g. LaunchpadVote.NEEDS_FIXING)
-    """
-    mp.setStatus(status=status, revid=revision)
-    subject = get_vote_subject(mp)
-    if vote:
-        mp.createComment(
-            review_type=get_config_option('launchpad_review_type'),
-            subject=subject, content=message, vote=vote)
-    else:
-        mp.createComment(
-            review_type=get_config_option('launchpad_review_type'),
-            subject=subject, content=message)
-
-
 def close_bugs(mp):
     """ Close bugs that are linked to this merge proposal.
 
@@ -390,95 +369,67 @@
     return False
 
 
-def approve_mp(mp, revision, build_url):
-    """Approve a given merge proposal a revision.
-
-    :params mp: launchpad handle to the respective merge proposal
-    :params revision: revision that should be approved
-    :params build_url: jenkins build url with the details. This job is used to
-                       generate the message with all the links to test runs as
-                       well as artifacts (coverity, deb files, etc)
-    """
-    state = 'PASSED: Continuous integration, rev:' + str(revision)
-    logger.debug(state)
-    content = jenkinsutils.format_message_for_mp_update(build_url,
-                                                        state + "\n")
-    mp.createComment(review_type=get_config_option('launchpad_review_type'),
-                     vote=LaunchpadVote.APPROVE, subject=get_vote_subject(mp),
-                     content=content)
-
-
-def disapprove_mp(mp, revision, build_url, reason=None):
-    """Disapprove a given merge proposal a revision (vote Needs Fixing).
-
-    :params mp: launchpad handle to the respective merge proposal
-    :params revision: revision that should be fixed
-    :params build_url: jenkins build url with the details. This job is used to
-                       generate the message with all the links to test runs as
-                       well as artifacts (coverity, deb files, etc)
-    :params reason: optional string that is attached to the comment
-    """
-    state = "FAILED: Continuous integration, rev:{revision}".format(
-        revision=revision)
-    if reason:
-        state = "{state}\n{reason}".format(state=state, reason=reason)
-
-    logger.debug(state)
-    content = jenkinsutils.format_message_for_mp_update(
-        build_url, state + "\n")
-    mp.createComment(review_type=get_config_option('launchpad_review_type'),
-                     vote=LaunchpadVote.NEEDS_FIXING,
-                     subject=get_vote_subject(mp),
-                     content=content)
+def report_to_launchpad(mp, message, revision, status=None, vote=None):
+    """Set the status and send a message to Launchpad for an merge proposal.
+
+    :param mp: handle to merge proposal
+    :param message: text message to post as a message
+    :param revision: revision number for the proposal
+    :param status: Launchpad status to set the propsal to
+    :param vote: how the message should vote on the proposal
+    """
+    if status:
+        mp.setStatus(status=status, revid=revision)
+    if vote:
+        mp.createComment(
+            review_type=get_config_option('launchpad_review_type'),
+            vote=vote,
+            subject=get_vote_subject(mp),
+            content=message)
+    else:
+        mp.createComment(
+            review_type=get_config_option('launchpad_review_type'),
+            subject=get_vote_subject(mp),
+            content=message)
+
+
+def get_template_args(result, revision, build_url, merge_url):
+    """Collect a set of information for rendering templates
+
+    :param result: Result of the tests, either PASSED or FAILED
+    :param revison: The revision number of the merge
+    :param build_url: URL to the build triggered in jenkins
+    :param merge_url: URL to the merge proposal
+    """
+    jenkins = get_json_jenkins()
+    args = {}
+    args['result'] = result
+    args['revision'] = revision
+    args['build_url'] = build_url
+    args['merge_url'] = merge_url
+    build_urls = jenkinsutils.get_executed_builds(jenkins, build_url)
+    args['coverity_artifacts'] = []
+    args['executed_tests'] = []
+    for build in build_urls:
+        if build['output'].endswith('console'):
+            build_url = build['output'][:-len('console')]
+            build['output'] = build_url
+            debs = jenkinsutils.get_deb_artifacts(jenkins, build_url)
+            if debs is None:
+                build['deb'] = []
+            else:
+                build['deb'] = debs
+            args['coverity_artifacts'].extend(
+                jenkinsutils.get_coverity_artifacts(jenkins, build_url)
+            )
+        args['executed_tests'].append(build)
+    return args
 
 
 class UpdateMergeProposalException(Exception):
     pass
 
 
-def build_state(args):
-    """Return a tuple containing merge proposal state, message, and
-    subject."""
-
-    if 'merge_failed' in args and args['merge_failed']:
-        return ('Needs review',
-                "FAILED: Autolanding.\n" +
-                "Merging failed. More details in the following jenkins job:\n")
-    elif 'push_failed' in args and args['push_failed']:
-        return ('Needs review',
-                "FAILED: Autolanding.\n" +
-                "Pushing failed. More details in the following jenkins job:\n")
-    elif 'landing_failed' in args and args['landing_failed']:
-        return ('Needs review',
-                "FAILED: Autolanding.\n" +
-                "More details in the following jenkins job:\n")
-    elif 'merged' in args and args['merged']:
-        return ('Merged',
-                "PASSED: Autolanding.\nBranch merged.")
-    elif 'commit_message_empty' in args and args['commit_message_empty']:
-        return ('Needs review',
-                "FAILED: Autolanding.\n" +
-                "No commit message was specified in the merge proposal. " +
-                "Hit 'Add commit message' on the merge proposal web page " +
-                "or follow the link below. You can approve the merge " +
-                "proposal yourself to rerun.\n" +
-                args['merge_proposal'] + "/+edit-commit-message\n")
-    elif 'unapproved_changes' in args and args['unapproved_changes']:
-        return ('Needs review',
-                "FAILED: Autolanding.\n" +
-                "Unapproved changes made after approval.\n")
-    elif 'invalid_revid' in args and args['invalid_revid']:
-        return ('Needs review',
-                "FAILED: Autolanding.\n" +
-                "Approved revid is not set in launchpad. " +
-                "This is most likely a launchpad issue and re-approve " +
-                "should fix it. There is also a chance " +
-                "(although a very small one) this is a permission " +
-                "problem of the ps-jenkins bot." +
-                "\n")
-    else:
-        raise UpdateMergeProposalException("unrecognized parameters")
-
 def get_branch_handle_for(lp_handle, name, repo_type='auto'):
     """ Return the branch type and repo handle for the given name.
 
 
=== modified file 'setup.py'
--- setup.py	2013-10-08 18:13:32 +0000
+++ setup.py	2019-05-09 18:32:44 +0000
@@ -1,10 +1,13 @@
 from distutils.core import setup
 from setuptools import find_packages
+import glob
 setup(
     name='jenkins-launchpad-plugin',
     version='0.1',
     url='https://launchpad.net/jenkins-launchpad-plugin',
     packages=find_packages(),
+    include_package_data=True,
+    data_files=[('templates', glob.glob('templates/*.j2'))],
     test_suite='tests',
     entry_points="""\
           [console_scripts]
 
=== added directory 'templates'
=== added file 'templates/autoland_header.j2'
--- templates/autoland_header.j2	1970-01-01 00:00:00 +0000
+++ templates/autoland_header.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,1 @@
+Autolanding: {{ args.result }}
 
=== added file 'templates/ci_test.j2'
--- templates/ci_test.j2	1970-01-01 00:00:00 +0000
+++ templates/ci_test.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,4 @@
+{{ args.result }}: Continuous integration, rev:{{ args.revision }}
+{% include 'footer.j2' %}
+
+{% include 'rebuild.j2' -%}
 
=== added file 'templates/commit_message_empty.j2'
--- templates/commit_message_empty.j2	1970-01-01 00:00:00 +0000
+++ templates/commit_message_empty.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,4 @@
+{% include 'autoland_header.j2' %}
+No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun. 
+{{ args.merge_url }}/+edit-commit-message
+{% include 'footer.j2' -%}
 
=== added file 'templates/coverity.j2'
--- templates/coverity.j2	1970-01-01 00:00:00 +0000
+++ templates/coverity.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,4 @@
+Coverity artifacts:
+{%- for cov in args.coverity_artifacts %}
+    {{ cov }}
+{%- endfor -%}
 
=== added file 'templates/executed_tests.j2'
--- templates/executed_tests.j2	1970-01-01 00:00:00 +0000
+++ templates/executed_tests.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,7 @@
+Executed test runs:
+{%- for build in args.executed_tests %}
+    {{ build.result }}: {{ build.output }}
+    {%- for deb in build.deb %}
+        deb: {{ deb }}
+    {%- endfor -%}
+{% endfor -%}
 
=== added file 'templates/footer.j2'
--- templates/footer.j2	1970-01-01 00:00:00 +0000
+++ templates/footer.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,7 @@
+{%- if args.build_url -%}
+{{ args.build_url }}
+{% include 'executed_tests.j2' %}
+{% if args.coverity_artifacts -%}
+{% include 'coverity.j2' %}
+{%- endif -%}
+{%- endif -%}
 
=== added file 'templates/invalid_commit_message.j2'
--- templates/invalid_commit_message.j2	1970-01-01 00:00:00 +0000
+++ templates/invalid_commit_message.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,4 @@
+Commit message lints:
+{% for error in errors -%}
+- {{ error }}
+{%- endfor -%}
 
=== added file 'templates/invalid_revid.j2'
--- templates/invalid_revid.j2	1970-01-01 00:00:00 +0000
+++ templates/invalid_revid.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,3 @@
+{% include 'autoland_header.j2' %}
+Approved revid is not set in launchpad.  This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot
+{% include 'footer.j2' -%}
 
=== added file 'templates/landing_failed.j2'
--- templates/landing_failed.j2	1970-01-01 00:00:00 +0000
+++ templates/landing_failed.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,3 @@
+{% include 'autoland_header.j2' %}
+More details in the following jenkins job:
+{% include 'footer.j2' -%}
 
=== added file 'templates/merge_failed.j2'
--- templates/merge_failed.j2	1970-01-01 00:00:00 +0000
+++ templates/merge_failed.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,3 @@
+{% include 'autoland_header.j2' %}
+Merging failed. More details in the following jenkins job:
+{% include 'footer.j2' -%}
 
=== added file 'templates/merged.j2'
--- templates/merged.j2	1970-01-01 00:00:00 +0000
+++ templates/merged.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,2 @@
+PASSED: Autolanding.
+Branch merged.
 
=== added file 'templates/no_commit.j2'
--- templates/no_commit.j2	1970-01-01 00:00:00 +0000
+++ templates/no_commit.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,4 @@
+No commit message was specified in the merge proposal.  Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
+{{ args.merge_url }}/+edit-commit-message
+{% include 'footer.j2' %}
+{% include 'rebuild.j2' -%}
 
=== added file 'templates/push_failed.j2'
--- templates/push_failed.j2	1970-01-01 00:00:00 +0000
+++ templates/push_failed.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,3 @@
+FAILED: Autolanding.
+Pushing failed. More details in the following jenkins job:
+{{ args.build_url }}
 \ No newline at end of file
 
=== added file 'templates/rebuild.j2'
--- templates/rebuild.j2	1970-01-01 00:00:00 +0000
+++ templates/rebuild.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,2 @@
+Click here to trigger a rebuild:
+{{ args.build_url }}/rebuild
 
=== added file 'templates/unapproved_changes.j2'
--- templates/unapproved_changes.j2	1970-01-01 00:00:00 +0000
+++ templates/unapproved_changes.j2	2019-05-09 18:32:44 +0000
@@ -0,0 +1,3 @@
+{% include 'autoland_header.j2' %}
+Unapproved changes made after approval.
+{% include 'footer.j2' -%}
 
=== modified file 'tests/test_autoland.py'
--- tests/test_autoland.py	2013-06-14 19:02:11 +0000
+++ tests/test_autoland.py	2019-05-09 18:32:44 +0000
@@ -154,7 +154,7 @@
         self.get_branch_from_mp = self.get_branch_from_mp_patch.start()
 
         self.change_mp_status_patch = patch(
-            'jlp.commands.autoland.launchpadutils.change_mp_status')
+            'jlp.commands.autoland.change_mp_status')
         self.change_mp_status = self.change_mp_status_patch.start()
 
     def tearDown(self):
@@ -493,7 +493,7 @@
             self.assertTrue("usage" in stderr.getvalue())
 
     @patch('jlp.commands.autoland.launchpadutils.get_branch_from_mp')
-    @patch('jlp.commands.autoland.launchpadutils.change_mp_status')
+    @patch('jlp.commands.autoland.change_mp_status')
     def test_test_result_failed(self, change_mp_status_mock, get_branch_mock):
         """Fail autolanding because of failed testing"""
 
 
=== modified file 'tests/test_jenkinsutils.py'
--- tests/test_jenkinsutils.py	2018-01-25 22:13:52 +0000
+++ tests/test_jenkinsutils.py	2019-05-09 18:32:44 +0000
@@ -1119,9 +1119,7 @@
           "\n    None: http://10.0.0.1:8080/job/my-job/13/console"}),
     ]
 
-    def test_get_result_line(self):
-        result = jenkinsutils._get_result_line(self.result, self.url)
-        self.assertEqual(result, self.expected)
+    # was get_result_line
 
 
 class LaunchpadTriggerGetExecutedTestRuns(unittest.TestCase):
@@ -1163,54 +1161,10 @@
 
     def tearDown(self):
         self.get_json_jenkins_patch.stop()
-
-    def test_get_executed_test_runs_message(self):
-        ret = jenkinsutils.get_executed_test_runs_message(self.build_url)
-        self.assertEqual(ret,
-                         self._get_executed_test_runs_message('jenkins:8080'))
-
-    def test_format_message_for_mp_update(self):
-        test_runs = self._get_executed_test_runs_message('jenkins:8080')
-        expected = dedent("""\
-     mymessage
-     http://jenkins:8080/job/my-job/3/{test_runs}
-
-     Click here to trigger a rebuild:
-     http://jenkins:8080/job/my-job/3/rebuild
-             """).format(test_runs=test_runs)
-        actual = jenkinsutils.format_message_for_mp_update(
-            self.build_url,
-            "mymessage\n")
-        self.assertEquals(actual, expected)
-
-    def test_format_message_with_empty_message(self):
-        test_runs = self._get_executed_test_runs_message('jenkins:8080')
-        expected = dedent("""\
-     http://jenkins:8080/job/my-job/3/{test_runs}
-
-     Click here to trigger a rebuild:
-     http://jenkins:8080/job/my-job/3/rebuild
-              """).format(test_runs=test_runs)
-
-        actual = jenkinsutils.format_message_for_mp_update(
-            self.build_url)
-        self.assertEquals(actual, expected)
-
-    def test_format_message_with_publishing_job(self):
-        test_runs = self._get_executed_test_runs_message(
-            'jenkins.qa.ubuntu.com')
-        expected = dedent("""\
-     http://jenkins.qa.ubuntu.com/job/my-job/3/{test_runs}
-
-     Click here to trigger a rebuild:
-     http://jenkins:8080/job/my-job/3/rebuild
-              """).format(test_runs=test_runs)
-
-        with patch("jlp.jenkinsutils.is_job_published",
-                   new=lambda x: True):
-            actual = jenkinsutils.format_message_for_mp_update(
-                self.build_url)
-            self.assertEquals(actual, expected)
+    
+    # executed_test_runs_message
+
+    # format message for MP update
 
 
 class TestTriggerCi(unittest.TestCase):
@@ -1294,10 +1248,10 @@
            new=lambda x, y, z: False)
     @patch('jlp.launchpadutils.users_allowed_to_trigger_jobs',
            new=lambda x: True)
-    @patch('jlp.launchpadutils.change_mp_status')
+    @patch('jlp.launchpadutils.report_to_launchpad')
     @patch('jlp.jenkinsutils.start_jenkins_job')
     def test_trigger_al_with_no_commit_message(self, start_jenkins_job,
-                                               change_mp_status):
+                                               report_to_launchpad):
         """If no commit message is set no jenkins job must be started and
         status of merge proposal must be changed to NEEDS_FIXING"""
         jenkinsutils.trigger_al_build(MagicMock(),
@@ -1307,7 +1261,7 @@
         # the new vote is the 5th argument in change_mp_status (and we count
         # from 0)
         new_vote_position = 4
-        self.assertEqual(change_mp_status.call_args[0][new_vote_position],
+        self.assertEqual(report_to_launchpad.call_args[0][new_vote_position],
                          launchpadutils.LaunchpadVote.NEEDS_FIXING)
 
     @patch('jlp.launchpadutils.is_commit_message_set',
 
=== modified file 'tests/test_launchpadutils.py'
--- tests/test_launchpadutils.py	2017-02-23 20:25:56 +0000
+++ tests/test_launchpadutils.py	2019-05-09 18:32:44 +0000
@@ -19,42 +19,53 @@
             'https://copde.launchpad.net/~user/project/name/merge/12345')
         self.assertEqual(branch, None)
 
-    @patch('jlp.launchpadutils.get_vote_subject',
-           new=lambda mp: 'Subject')
-    def test_change_mp_status_with_no_vote(self):
-        mp = MagicMock()
-        launchpadutils.change_mp_status(mp, 'Status', 'Message', revision=1)
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            subject='Subject',
-            content='Message')
-        mp.setStatus.assert_called_once_with(status='Status', revid=1)
-
-    @patch('jlp.launchpadutils.get_vote_subject',
-           new=lambda mp: 'Subject')
-    def test_change_mp_status_with_approve(self):
-        mp = MagicMock()
-        mp.web_link = 'http://my-example-url.com'
-        launchpadutils.change_mp_status(mp, 'Status', 'Message',
-                                        revision=1, vote='Approve')
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            subject='Subject',
-            content='Message', vote='Approve')
-        mp.setStatus.assert_called_once_with(status='Status', revid=1)
-
-    @patch('jlp.launchpadutils.get_vote_subject',
-           new=lambda mp: 'Subject')
-    def test_change_mp_status_with_disapprove(self):
-        mp = MagicMock()
-        mp.web_link = 'http://my-example-url.com'
-        launchpadutils.change_mp_status(mp, 'Status', 'Message',
-                                        revision=1, vote='Disapprove')
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            subject='Subject',
-            content='Message', vote='Disapprove')
-        mp.setStatus.assert_called_once_with(status='Status', revid=1)
+    @patch('jlp.launchpadutils.get_config_option')
+    @patch('jlp.launchpadutils.get_vote_subject')
+    def test_report_to_launchpad_status(self, gvs_mock, gco_mock):
+        gvs_mock.return_value = 'vote subject'
+        gco_mock.return_value = 'vote type'
+        mp = MagicMock()
+        message = 'this is a test'
+        revision = 'abc123'
+        status = 'Approved'
+        launchpadutils.report_to_launchpad(mp, message, revision, status)
+        mp.setStatus.assert_called_once_with(revid='abc123', status='Approved')
+        mp.createComment.assert_called_once_with(
+            content='this is a test',
+            review_type='vote type',
+            subject='vote subject')
+
+    @patch('jlp.launchpadutils.get_config_option')
+    @patch('jlp.launchpadutils.get_vote_subject')
+    def test_report_to_launchpad_vote(self, gvs_mock, gco_mock):
+        gvs_mock.return_value = 'vote subject'
+        gco_mock.return_value = 'vote type'
+        mp = MagicMock()
+        message = 'this is a test'
+        revision = 'abc123'
+        launchpadutils.report_to_launchpad(mp, message, revision, 'approved')
+        mp.createComment.assert_called_once_with(
+            content='this is a test',
+            review_type='vote type',
+            subject='vote subject')
+
+    @patch('jlp.launchpadutils.get_config_option')
+    @patch('jlp.launchpadutils.get_vote_subject')
+    def test_report_to_launchpad_status_and_vote(self, gvs_mock, gco_mock):
+        gvs_mock.return_value = 'vote subject'
+        gco_mock.return_value = 'vote type'
+        mp = MagicMock()
+        message = 'this is a test'
+        revision = 'abc123'
+        status = 'Approved'
+        launchpadutils.report_to_launchpad(mp, message,
+            revision, status, 'approved')
+        mp.setStatus.assert_called_once_with(revid='abc123', status='Approved')
+        mp.createComment.assert_called_once_with(
+            content='this is a test',
+            review_type='vote type',
+            subject='vote subject',
+            vote='approved')
 
     def test_close_bugs(self):
         mp = MagicMock()
@@ -564,97 +575,6 @@
     def tearDown(self):
         self.get_executed_test_runs_message_patch.stop()
 
-    def test_approve_mp(self):
-        mp = self._get_mp()
-        subject = self._get_subject(mp)
-        launchpadutils.approve_mp(mp, '1', 'http://url')
-        content = dedent('''\
-                            PASSED: Continuous integration, rev:1
-                            http://url
-
-                            Click here to trigger a rebuild:
-                            http://url/rebuild
-                            ''')
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            vote=launchpadutils.LaunchpadVote.APPROVE,
-            subject=subject,
-            content=content)
-
-    def test_disapprove_mp(self):
-        mp = self._get_mp()
-        subject = self._get_subject(mp)
-        launchpadutils.disapprove_mp(mp, '1', 'http://url')
-        content = dedent('''\
-                            FAILED: Continuous integration, rev:1
-                            http://url
-
-                            Click here to trigger a rebuild:
-                            http://url/rebuild
-                            ''')
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            vote=launchpadutils.LaunchpadVote.NEEDS_FIXING,
-            subject=subject,
-            content=content)
-
-    def test_disapprove_mp_with_reason(self):
-        mp = self._get_mp()
-        subject = self._get_subject(mp)
-        reason = "No commit message set\nDo something\n"
-        content = dedent('''\
-                            FAILED: Continuous integration, rev:1
-                            {reason}
-                            http://url
-
-                            Click here to trigger a rebuild:
-                            http://url/rebuild
-                            ''').format(reason=reason)
-
-        launchpadutils.disapprove_mp(mp,
-                                     '1',
-                                     'http://url',
-                                     reason=reason)
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            vote=launchpadutils.LaunchpadVote.NEEDS_FIXING,
-            subject=subject,
-            content=content)
-
-    def test_approve_git_mp(self):
-        mp = self._get_git_mp()
-        subject = self._expected_git_mp_subject(mp)
-        launchpadutils.approve_mp(mp, '1', 'http://url')
-        content = dedent('''\
-                            PASSED: Continuous integration, rev:1
-                            http://url
-
-                            Click here to trigger a rebuild:
-                            http://url/rebuild
-                            ''')
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            vote=launchpadutils.LaunchpadVote.APPROVE,
-            subject=subject,
-            content=content)
-
-    def test_dissaprove_git_mp(self):
-        mp = self._get_git_mp()
-        subject = self._expected_git_mp_subject(mp)
-        launchpadutils.disapprove_mp(mp, '1', 'http://url')
-        content = dedent('''\
-                            FAILED: Continuous integration, rev:1
-                            http://url
-
-                            Click here to trigger a rebuild:
-                            http://url/rebuild
-                            ''')
-        mp.createComment.assert_called_once_with(
-            review_type=get_config_option('launchpad_review_type'),
-            vote=launchpadutils.LaunchpadVote.NEEDS_FIXING,
-            subject=subject,
-            content=content)
-
 
 class TestGetMergeProposalsWithInvalidBranch(unittest.TestCase):
     branch_with_mps = None
@@ -905,7 +825,7 @@
 
         self.assertEqual(result, ('git', repo))
 
-    def test_raises_for_no_mathc(self):
+    def test_raises_for_no_match(self):
         '''
         Ensure that an exception is raised when there is no match.
         '''
 
=== modified file 'tests/test_voteOnMergeProposal.py'
--- tests/test_voteOnMergeProposal.py	2013-11-19 00:11:18 +0000
+++ tests/test_voteOnMergeProposal.py	2019-05-09 18:32:44 +0000
@@ -12,9 +12,6 @@
             'jlp.commands.voteOnMergeProposal.get_launchpad',
             new=get_launchpad)
         self.get_launchpad_patch.start()
-        self.get_executed_test_runs_message_patch = patch(
-            'jlp.jenkinsutils.get_executed_test_runs_message')
-        self.get_executed_test_runs_message_patch.start()
         self.is_commit_message_set_patch = patch(
             'jlp.launchpadutils.is_commit_message_set')
         self.is_commit_message_set_patch.start()
@@ -22,7 +19,6 @@
     def tearDown(self):
         self.get_launchpad_patch.stop()
         self.is_commit_message_set_patch.stop()
-        self.get_executed_test_runs_message_patch.stop()
 
     def test_gibberish(self):
         """Gibberish on the command line produces usage message."""
@@ -112,7 +108,12 @@
                 pass
             self.assertTrue(error_message in stderr.getvalue())
 
-    def test_passed_vote(self):
+    @patch('sys.argv')
+    @patch('jlp.commands.voteOnMergeProposal.launchpadutils.get_mp_handle_from_url')
+    @patch('jlp.launchpadutils.report_to_launchpad')
+    @patch('jlp.commands.voteOnMergeProposal.launchpadutils.get_template_args')
+    @patch('jlp.commands.voteOnMergeProposal.get_jinja_environment')
+    def test_passed_vote(self, gje, gta, rtl, gmphandle, sys_argv):
         """Vote on a proposal which passed."""
 
         sys_argv = ['voteOnMergeProposal.py',
@@ -123,20 +124,27 @@
                     '--branch=lp:~mrazik/faux-dbus-test-runner/yar8',
                     '--merge-proposal=https://code.launchpad.net/~mrazik/' +
                     'faux-dbus-test-runner/yar8/+merge/106113']
-        with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.voteOnMergeProposal.launchpadutils.' +
-                      'get_mp_handle_from_url') as get_mp_handle_from_url, \
-                patch('jlp.launchpadutils.approve_mp') as approve_mp:
-            get_mp_handle_from_url.return_value = 'Launchpad_mp'
-            ret = voteOnMergeProposal()
-            self.assertEqual(ret, 0)
-            approve_mp.assert_called_with(
-                'Launchpad_mp',
-                '66',
-                'http://s-jenkins.ubuntu-ci/job/faux-dbus-test-runner-ci/' +
-                'configure')
-
-    def test_no_commit_message_set(self):
+
+        gmphandle.return_value = 'Launchpad_mp'
+        gta.return_value = {
+            'result': 'PASSED',
+            'revision': '66'
+        }
+        ret = voteOnMergeProposal()
+        self.assertEqual(ret, 0)
+        rtl.assert_called_once()
+        gje.get_template.assert_called_with('ci_test.j2')
+
+
+    @patch('sys.argv')
+    @patch('jlp.commands.voteOnMergeProposal.launchpadutils.' +\
+           'get_mp_handle_from_url')
+    @patch('jlp.launchpadutils.report_to_launchpad')
+    @patch('jlp.launchpadutils.is_commit_message_set')
+    @patch('jlp.commands.voteOnMergeProposal.launchpadutils.get_template_args')
+    @patch('jlp.commands.voteOnMergeProposal.get_jinja_environment')
+    def test_no_commit_message_set(self, gje, gta, icms,
+                                   rtl, gmphandle, sys_argv):
         """Vote on a proposal where tests passed but no commit message
            was set."""
 
@@ -149,77 +157,16 @@
                     '--revision=66',
                     '--branch=lp:~mrazik/faux-dbus-test-runner/yar8',
                     '--merge-proposal=' + merge_proposal]
-        with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.voteOnMergeProposal.launchpadutils.' +
-                      'get_mp_handle_from_url') as get_mp_handle_from_url, \
-                patch('jlp.launchpadutils.is_commit_message_set') \
-                as is_commit_message_set, \
-                patch('jlp.launchpadutils.disapprove_mp') as disapprove_mp:
-            get_mp_handle_from_url.return_value = 'Launchpad_mp'
-            is_commit_message_set.return_value = False
-            reason = "No commit message was specified in the merge " + \
-                     "proposal. Click on the following link and set the " + \
-                     "commit message (if you want a jenkins rebuild you " +\
-                     "need to trigger it yourself):\n" + \
-                     merge_proposal + "/+edit-commit-message\n"
-            ret = voteOnMergeProposal()
-            self.assertEqual(ret, 0)
-            disapprove_mp.assert_called_with(
-                'Launchpad_mp',
-                '66',
-                'http://s-jenkins.ubuntu-ci/job/faux-dbus-test-runner-ci/' +
-                'configure',
-                reason)
-
-    def test_invalid_build_url(self):
-        """Vote on a proposal where tests passed but no commit message
-           was set."""
-
-        sys_argv = ['voteOnMergeProposal.py',
-                    '--status=PASSED',
-                    '--build-url=http://s-jenkins.ubuntu-ci/asdf/' +
-                    'faux-dbus-test-runner-ci/configure',
-                    '--revision=66',
-                    '--branch=lp:~mrazik/faux-dbus-test-runner/yar8',
-                    '--merge-proposal=https://code.launchpad.net/~mrazik/' +
-                    'faux-dbus-test-runner/yar8/+merge/106113']
-        with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.voteOnMergeProposal.launchpadutils.' +
-                      'get_mp_handle_from_url') as get_mp_handle_from_url, \
-                patch('jlp.commands.voteOnMergeProposal.launchpadutils.' +
-                      'is_commit_message_set') as is_commit_message_set, \
-                patch('jlp.launchpadutils.approve_mp') as approve_mp:
-            get_mp_handle_from_url.return_value = 'Launchpad_mp'
-            is_commit_message_set.return_value = False
-            ret = voteOnMergeProposal()
-            self.assertEqual(ret, 0)
-            approve_mp.assert_called_with(
-                'Launchpad_mp',
-                '66',
-                'http://s-jenkins.ubuntu-ci/asdf/faux-dbus-test-runner-ci/' +
-                'configure')
-
-    def test_not_passed_vote(self):
-        """Vote on a proposal which did not pass."""
-
-        sys_argv = ['voteOnMergeProposal.py',
-                    '--status=OHECK',
-                    '--build-url=http://s-jenkins.ubuntu-ci/job/' +
-                    'faux-dbus-test-runner-ci/configure',
-                    '--revision=66',
-                    '--branch="lp:~mrazik/faux-dbus-test-runner/yar8"',
-                    '--merge-proposal=https://code.launchpad.net/~mrazik/' +
-                    'faux-dbus-test-runner/yar8/+merge/106113']
-        with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.voteOnMergeProposal.launchpadutils.' +
-                      'get_mp_handle_from_url') as get_mp_handle_from_url, \
-                patch('jlp.launchpadutils.disapprove_mp') as disapprove_mp:
-            get_mp_handle_from_url.return_value = 'Launchpad_mp'
-            ret = voteOnMergeProposal()
-            self.assertEqual(ret, 0)
-            disapprove_mp.assert_called_with(
-                'Launchpad_mp',
-                '66',
-                'http://s-jenkins.ubuntu-ci/job/faux-dbus-test-runner-ci/' +
-                'configure',
-                '')
+
+        gmphandle.return_value = 'Launchpad_mp'
+        gta.return_value = {
+            'result': 'PASSED',
+            'revision': '66',
+            'build_url': 'http://s-jenkins.ubuntu-ci/job/' +
+                         'faux-dbus-test-runner-ci/configure'
+        }
+        icms.return_value = False
+        
+        ret = voteOnMergeProposal()
+        self.assertEqual(ret, 0)
+        gje.get_template.assert_called_with('no_commit.j2')