Merge lp:~albaguirre/jenkins-launchpad-plugin/support-lp-trigger-for-git-mps into lp:jenkins-launchpad-plugin

[Alberto Aguirre]

launchPadTrigger: Add support for git projects

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'jlp/commands/launchpadTrigger.py'
--- jlp/commands/launchpadTrigger.py	2013-05-10 14:10:52 +0000
+++ jlp/commands/launchpadTrigger.py	2016-08-13 18:04:14 +0000
@@ -8,20 +8,20 @@
 LAUNCHPADLIB_DIR_PREFIX = os.path.expanduser('~/.launchpadlib')
 
 
-def trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir):
+def trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir, repo_type):
     """Trigger a CI build."""
 
     launchpad = get_launchpad(launchpadlib_dir)
-    mps = get_merge_proposals(launchpad, branch, ['Needs review'])
+    mps = get_merge_proposals(launchpad, branch, ['Needs review'], repo_type)
     jenkinsutils.trigger_ci_build(launchpad, mps, job, jenkins_url)
 
 
 def trigger_al_build(branch, job, jenkins_url, fasttrack_merge,
-                     launchpadlib_dir):
+                     launchpadlib_dir, repo_type):
     """Trigger an autolanding build."""
 
     launchpad = get_launchpad(launchpadlib_dir)
-    mps = get_merge_proposals(launchpad, branch, ['Approved'])
+    mps = get_merge_proposals(launchpad, branch, ['Approved'], repo_type)
     jenkinsutils.trigger_al_build(launchpad, mps, job, jenkins_url,
                                   fasttrack_merge)
 
@@ -32,7 +32,8 @@
                     job=None,
                     jenkins_url=None,
                     fasttrack_merge=False,
-                    lock_name=''):
+                    lock_name='',
+                    repo_type='bazaar'):
     """Trigger a Jenkins build."""
 
     if jenkins_url is None:
@@ -43,10 +44,10 @@
         launchpadlib_dir))
 
     if trigger_ci:
-        trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir)
+        trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir, repo_type)
     elif autoland:
         trigger_al_build(branch, job, jenkins_url, fasttrack_merge,
-                         launchpadlib_dir)
+                         launchpadlib_dir, repo_type)
     return 1
 
 
@@ -75,6 +76,9 @@
                         default='launchpadTrigger',
                         help='''Name of the lock and launchpadlib cache
                         to be used''')
+    parser.add_argument('-r', '--repo-type',
+                        default='bazaar',
+                        help='''What type of branches to trigger jobs for [git or bazaar]''')
 
     args = vars(parser.parse_args())
 

=== modified file 'jlp/jenkinsutils.py'
--- jlp/jenkinsutils.py	2016-02-05 13:20:38 +0000
+++ jlp/jenkinsutils.py	2016-08-13 18:04:14 +0000
@@ -670,6 +670,16 @@
     params['hooks'] = get_parameter(jenkins, job_url, 'dput_hooks', '')
     params['test_result'] = "PASSED"
 
+def get_jenkins_params(mp):
+    params = {
+        'landing_candidate': launchpadutils.get_source_repo(mp),
+        'merge_proposal': mp.web_link,
+        'candidate_revision': launchpadutils.get_latest_revision(mp)}
+
+    if '+git' in mp.web_link:
+        params['landing_candidate_branch'] = launchpadutils.get_source_branch(mp)
+
+    return params
 
 def start_jenkins_job(lp_handle, launchpaduser, jenkins_url, jenkins_job, mp,
                       fasttrack_merge=False):
@@ -686,10 +696,8 @@
     """
     j = jenkins.Jenkins(jenkins_url, get_config_option('jenkins_user'),
                         get_config_option('jenkins_password'))
-    jenkins_params = {
-        'landing_candidate': mp.source_branch.bzr_identity,
-        'merge_proposal': mp.web_link,
-        'candidate_revision': mp.source_branch.revision_count}
+
+    jenkins_params = get_jenkins_params(mp)
 
     job_info = j.get_job_info(jenkins_job)
     if not job_info['buildable']:

=== modified file 'jlp/launchpadutils.py'
--- jlp/launchpadutils.py	2016-08-13 18:04:14 +0000
+++ jlp/launchpadutils.py	2016-08-13 18:04:14 +0000
@@ -9,6 +9,23 @@
     DISAPPROVE = 'Disapprove'
     NEEDS_FIXING = 'Needs Fixing'
 
+def get_source_repo(mp):
+    if '+git' in mp.web_link:
+        return mp.source_git_repository.git_identity
+    else:
+        return mp.target_branch.bzr_identity
+
+def get_source_branch(mp):
+    if '+git' in mp.web_link:
+        return mp.source_git_path.replace('refs/heads/', '')
+    else:
+        return mp.source_branch.bzr_identity
+
+def get_target_branch(mp):
+    if '+git' in mp.web_link:
+        return mp.target_git_path.replace('refs/heads/', '')
+    else:
+        return mp.target_branch.bzr_identity
 
 def get_vote_subject(mp):
     """Given a mp handle return a subject for the vote message
@@ -271,6 +288,11 @@
         return True
     return False
 
+def get_review_revision_regex(mp):
+    if '+git' in mp.web_link:
+        return '^(PASSED|FAILED): Continuous integration, rev:([0-9a-f]+)'
+    else:
+        return '^(PASSED|FAILED): Continuous integration, rev:(\d+)'
 
 def get_latest_review(launchpad_user, mp):
     """Return the latest revision reviewed by the given launchpad_user.
@@ -287,12 +309,25 @@
         if comment.author.name == launchpad_user.name:
             if comment.vote_tag == launchpad_review_type:
                 m = re.search(
-                    '^(PASSED|FAILED): Continuous integration, rev:(\d+)',
+                    get_review_revision_regex(mp),
                     comment.message_body)
-                if m and (int(m.group(2)) > revision):
-                    revision = int(m.group(2))
+                if m:
+                    revision = m.group(2)
     return revision
 
+def get_latest_revision(mp):
+    """Return the latest revision of the given merge proposal.
+
+    :param mp: handle to merge proposal
+    """
+    if '+git' in mp.web_link:
+        for ref in mp.source_git_repository.refs_collection:
+            if ref.path == mp.source_git_path:
+                return ref.commit_sha1
+        return str(0)
+    else:
+        return mp.source_branch.revision_count
+
 
 def latest_candidate_validated(launchpad_user, mp):
     """Return if the latest candidate revision of the merge proposal is
@@ -305,9 +340,11 @@
 
     latest_review = get_latest_review(launchpad_user, mp)
     logger.debug('Latest_review is revision: ' + str(latest_review))
-    if latest_review >= mp.source_branch.revision_count:
+    latest_revision = get_latest_revision(mp)
+    logger.debug('Latest revision is: ' + str(latest_revision))
+    if latest_review == latest_revision:
         logger.debug('Skipping this MP. Current revision: ' +
-                     str(mp.source_branch.revision_count))
+                     str(latest_revision))
         return True
     return False
 

=== modified file 'tests/test_launchpadTrigger.py'
--- tests/test_launchpadTrigger.py	2013-05-10 14:10:52 +0000
+++ tests/test_launchpadTrigger.py	2016-08-13 18:04:14 +0000
@@ -142,6 +142,27 @@
                                                 'http://localhost:8080/')
 
 
+    def test_trigger_git_ci(self):
+        """Trigger CI got a git repo."""
+
+        sys_argv = ["launchpadTrigger.py",
+                    "--branch=lp:faux-dbus-test-runner",
+                    "--trigger-ci",
+                    "--job=faux-dbus-test-runner",
+                    "--repo-type=git"]
+        with patch('sys.argv', sys_argv), \
+             patch('jlp.commands.launchpadTrigger.get_merge_proposals') as \
+                get_merge_proposals, \
+                patch('jlp.commands.launchpadTrigger.jenkinsutils.' +
+                              'trigger_ci_build') as trigger_ci_build:
+            get_merge_proposals.return_value = [self.merge_proposal]
+            launchpadTrigger()
+            get_merge_proposals.assert_called_with(self.launchpad,
+                                                   'lp:faux-dbus-test-runner',
+                                                   ['Needs review'],
+                                                   'git')
+
+
 class TestLockNames(PatchedLaunchpadTriggerTest):
 
     sys_argv = ["launchpadTrigger.py",
@@ -192,7 +213,7 @@
                             lock_name=self.lock_name)
             trigger_ci_build.assert_called_with(
                 None, None, get_config_option('jenkins_url'),
-                self.expected_cache_dir)
+                self.expected_cache_dir, 'bazaar')
 
     def test_lock_name_autolanding(self):
         """test trigger_jenkins method for correct use of lock_name param"""
@@ -204,4 +225,17 @@
                             lock_name=self.lock_name)
             trigger_al_build.assert_called_with(
                 None, None, get_config_option('jenkins_url'),
-                False, self.expected_cache_dir)
+                False, self.expected_cache_dir, 'bazaar')
+
+    def test_repo_type_is_propagated(self):
+        """test trigger_jenkins method for correct use of lock_name param"""
+
+        with patch('jlp.commands.launchpadTrigger.trigger_al_build') \
+                as trigger_al_build:
+            trigger_jenkins(branch=None,
+                            autoland=True,
+                            lock_name=self.lock_name,
+                            repo_type='git')
+            trigger_al_build.assert_called_with(
+                None, None, get_config_option('jenkins_url'),
+                False, self.expected_cache_dir, 'git')

=== modified file 'tests/test_launchpadutils.py'
--- tests/test_launchpadutils.py	2016-08-13 18:04:14 +0000
+++ tests/test_launchpadutils.py	2016-08-13 18:04:14 +0000
@@ -411,7 +411,7 @@
                                "URL:..."
         mp.all_comments = [comment]
         self.assertEqual(
-            launchpadutils.get_latest_review(self.launchpad_user, mp), 47)
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '47')
 
     def test_get_latest_review_which_failed(self):
         mp = MagicMock()
@@ -422,7 +422,7 @@
                                "URL:..."
         mp.all_comments = [comment]
         self.assertEqual(
-            launchpadutils.get_latest_review(self.launchpad_user, mp), 47)
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '47')
 
     @patch('jlp.launchpadutils.get_latest_review', new=lambda x, y: 60)
     def test_new_mp_candidate_revision_in_queue(self):
@@ -448,6 +448,77 @@
                 self.launchpad_user, mp)
             self.assertTrue(ret)
 
+class TestLatestReviewForGitMPs(unittest.TestCase):
+    def setUp(self):
+        self.launchpad_user = MagicMock()
+        self.jenkinsUserName = 'name'
+        self.launchpad_user.name = self.jenkinsUserName
+
+    def create_mp(self):
+        mp = MagicMock()
+        mp.web_link = 'https://code.launchpad.net/~user/project/+git/project/+merge/777'
+        return mp
+
+    def create_mp_with_revision(self, revision):
+        mp = self.create_mp()
+        path = "refs/heads/nice"
+        ref = MagicMock()
+        ref.path = path
+        ref.commit_sha1 = revision
+        mp.source_git_path = path
+        mp.source_git_repository.refs_collection = [ref]
+        return mp
+
+    def test_get_latest_review_no_comments(self):
+        mp = self.create_mp()
+        mp.all_comments = []
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), 0)
+
+    def test_get_latest_review_unrelated_comment(self):
+        mp = self.create_mp()
+        comment = MagicMock()
+        comment.vote_tag = get_config_option('launchpad_review_type')
+        comment.message_body = 'unrelated comment'
+        mp.all_comments = [comment]
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), 0)
+
+    def test_get_latest_review_which_passed(self):
+        mp = self.create_mp()
+        comment = MagicMock()
+        comment.author.name = self.jenkinsUserName
+        comment.vote_tag = get_config_option('launchpad_review_type')
+        comment.message_body = "PASSED: Continuous integration, rev:2fd4e1c67a2d28fced849ee1bb76e7391b93eb12\n" + \
+                               "URL:..."
+        mp.all_comments = [comment]
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+
+    def test_get_latest_review_which_failed(self):
+        mp = self.create_mp()
+        comment = MagicMock()
+        comment.author.name = self.jenkinsUserName
+        comment.vote_tag = get_config_option('launchpad_review_type')
+        comment.message_body = "FAILED: Continuous integration, rev:2fd4e1c67a2d28fced849ee1bb76e7391b93eb12\n" + \
+                               "URL:..."
+        mp.all_comments = [comment]
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+
+    @patch('jlp.launchpadutils.get_latest_review', new=lambda x, y: '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+    def test_new_mp_candidate_revision_in_queue(self):
+        mp = self.create_mp_with_revision('de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3')
+        ret = launchpadutils.latest_candidate_validated(
+            self.launchpad_user, mp)
+        self.assertFalse(ret)
+
+    @patch('jlp.launchpadutils.get_latest_review', new=lambda x, y: '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+    def test_mp_already_validated(self):
+        mp = self.create_mp_with_revision('2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+        ret = launchpadutils.latest_candidate_validated(
+            self.launchpad_user, mp)
+        self.assertTrue(ret)
 
 class TestApproveAndDisapprove(unittest.TestCase):
     jenkinsUserName = 'jenkins-user'