Merge lp:~mrazik/jenkins-launchpad-plugin/rebuild_link into lp:~private-ps-quality-team/jenkins-launchpad-plugin/trunk

[Martin Mrazik]

Adding a direct link to trigger a (CI only) rebuild.
I don't want to add the link for autolanding as it is a bit more tricky there (you need to set the state to approve anyway and that will trigger the building; if you would trigger manually _and_ change the state to Approved there is a potential for race condition).

Adding a direct link to trigger a (CI only) rebuild.
I don't want to add the link for autolanding as it is a bit more tricky there (you need to set the state to approve anyway and that will trigger the building; if you would trigger manually _and_ change the state to Approved there is a potential for race condition).

[Martin Mrazik (mrazik)]

Here is an example of the new links:
https://code.launchpad.net/~mrazik/faux-dbus-test-runner/Nov20-1/+merge/135126

[lp:~mrazik/jenkins-launchpad-plugin/rebuild_link]

70. By Martin Mrazik on 2012-11-20

ppe8 fix

[Michael Zanetti (mzanetti)]

looks good to me

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://s-jenkins:8080/job/jenkins-launchpad-plugin-ci/175/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/jenkins-launchpad-plugin-ci/./distribution=precise,flavor=i386/175/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

I killed the last CI job as it was blocking autolanding.

=== modified file 'autoland.py'
--- autoland.py	2012-11-15 16:24:05 +0000
+++ autoland.py	2012-11-20 12:07:24 +0000
@@ -56,8 +56,10 @@
 def change_mp_status(launchpad, mp, reason, args, vote):
     args[reason] = True
     mp_state, message, subject = build_state(args)
-    message = launchpad.format_message_for_mp_update(args['build_job_url'],
-                                                     message)
+    message = launchpad.format_message_for_mp_update(
+                                        args['build_job_url'],
+                                        message,
+                                        include_rebuild_link=False)
     launchpad.change_mp_status(mp, mp_state, message, subject,
                                args['revision'], vote)
 
 
=== modified file 'launchpad.py'
--- launchpad.py	2012-11-06 12:45:09 +0000
+++ launchpad.py	2012-11-20 12:07:24 +0000
@@ -11,6 +11,7 @@
 from xml.dom.minidom import parseString
 import re
 from jsonjenkins import JSONJenkins
+from textwrap import dedent
 
 
 class LaunchpadAgent():
@@ -198,22 +199,22 @@
     def approve_mp(self, mp, revision, build_url):
         state = 'PASSED: Continuous integration, rev:' + str(revision)
         logger.debug(state)
+        content = self.format_message_for_mp_update(build_url,
+                                                    state + "\n")
         mp.createComment(review_type=LAUNCHPAD_REVIEW_TYPE,
                          vote=LaunchpadVote.APPROVE, subject=state,
-                         content=state + "\n" +
-                         self.hide_jenkins_url(build_url) +
-                         self.get_executed_test_runs(build_url))
+                         content=content)
         review = MergeProposalReview(mp)
         review.unlock()
 
     def disapprove_mp(self, mp, revision, build_url):
         state = 'FAILED: Continuous integration, rev:' + str(revision)
         logger.debug(state)
+        content = self.format_message_for_mp_update(build_url,
+                                                    state + "\n")
         mp.createComment(review_type=LAUNCHPAD_REVIEW_TYPE,
                          vote=LaunchpadVote.NEEDS_FIXING, subject=state,
-                         content=state + "\n" +
-                         self.hide_jenkins_url(build_url) +
-                         self.get_executed_test_runs(build_url))
+                         content=content)
         review = MergeProposalReview(mp)
         review.unlock()
 
@@ -234,8 +235,17 @@
                        self.hide_jenkins_url(run['url']) + 'console')
         return ret
 
-    def format_message_for_mp_update(self, build_url, message=None):
-        formatted_message = '{message}{build_url}{executed_test_runs}'
+    def format_message_for_mp_update(self, build_url, message=None,
+                                     include_rebuild_link=True):
+        formatted_message = dedent('''\
+                {message}{build_url}{executed_test_runs}
+                ''')
+        if include_rebuild_link:
+                formatted_message = formatted_message + dedent('''\
+
+                Click here to trigger a rebuild:
+                {build_url}/rebuild/?
+                ''')
         if not message:
             message = ''
         if not build_url:
 
=== modified file 'tests/test_launchpadTrigger.py'
--- tests/test_launchpadTrigger.py	2012-10-05 07:26:19 +0000
+++ tests/test_launchpadTrigger.py	2012-11-20 12:07:24 +0000
@@ -256,22 +256,36 @@
         mp.web_link = 'http://mp'
         self.launchpadTrigger.approve_mp(mp, '1', 'http://url')
         subject = 'PASSED: Continuous integration, rev:1'
+        content = dedent('''\
+                            {subject}
+                            http://url
+
+                            Click here to trigger a rebuild:
+                            http://url/rebuild/?
+                            ''').format(subject=subject)
         mp.createComment.assert_called_once_with(
                         review_type=LAUNCHPAD_REVIEW_TYPE,
                         vote=launchpad.LaunchpadVote.APPROVE,
                         subject=subject,
-                        content=subject + "\nhttp://url")
+                        content=content)
 
     def test_disapprove_mp(self):
         mp = MagicMock()
         mp.web_link = 'http://mp'
         self.launchpadTrigger.disapprove_mp(mp, '1', 'http://url')
         subject = 'FAILED: Continuous integration, rev:1'
+        content = dedent('''\
+                            {subject}
+                            http://url
+
+                            Click here to trigger a rebuild:
+                            http://url/rebuild/?
+                            ''').format(subject=subject)
         mp.createComment.assert_called_once_with(
                         review_type=LAUNCHPAD_REVIEW_TYPE,
                         vote=launchpad.LaunchpadVote.NEEDS_FIXING,
                         subject=subject,
-                        content=subject + "\nhttp://url")
+                        content=content)
 
 
 class TestLaunchpadTrigger(unittest.TestCase):
@@ -551,7 +565,11 @@
                           http://jenkins/34
                           Executed test runs:
                               Passed: http://url/console
-                              Passed: http://url/console""")
+                              Passed: http://url/console
+
+                          Click here to trigger a rebuild:
+                          http://jenkins/34/rebuild/?
+                          """)
         actual = self.launchpadTrigger.format_message_for_mp_update(
                                                            'http://jenkins/34',
                                                            "mymessage\n")
@@ -562,7 +580,11 @@
                           http://jenkins/34
                           Executed test runs:
                               Passed: http://url/console
-                              Passed: http://url/console""")
+                              Passed: http://url/console
+
+                          Click here to trigger a rebuild:
+                          http://jenkins/34/rebuild/?
+                          """)
 
         actual = self.launchpadTrigger.format_message_for_mp_update(
                                                            'http://jenkins/34')