Merge lp:~maxiberta/ols-jenkaas/landing-logging-1 into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Maximiliano Bertacchini]

Log git merge command

[Guillermo Gonzalez (verterok)]

LGTM

review: Approve

=== modified file 'olsjenkaas/commands.py'
--- olsjenkaas/commands.py	2020-07-07 16:07:12 +0000
+++ olsjenkaas/commands.py	2022-06-03 19:57:13 +0000
@@ -273,7 +273,7 @@
         # the slave home directory is not exposed in the container.
         # -- vila 2017-02-07
         remote_work_dir = os.path.join('/workspace', rel_path)
-        # XXX verterok 2020-07-07 - temporary fix until we can get the 
+        # XXX verterok 2020-07-07 - temporary fix until we can get the
         # worker work_dir changed
         remote_work_dir = remote_work_dir.replace(
             '/var/lib/jenkins', '')
@@ -400,7 +400,10 @@
     def vcs(self, vcs_cmd_name, args):
         try:
             vcs_cmd = [vcs_cmd_name] + args
-            return subprocesses.run(vcs_cmd)
+            logger.info('Running VCS command: {!r}'.format(vcs_cmd))
+            ret = subprocesses.run(vcs_cmd)
+            logger.info('VCS command returned: {!r}'.format(ret))
+            return ret
         except errors.CommandError:
             logger.exception('{} failed'.format(' '.join(vcs_cmd)))
             raise
@@ -704,9 +707,11 @@
 
     def merge_proposed_branch(self, work_dir, proposal):
         with olsjenkaas.working_directory(work_dir):
-            self.git(['fetch', proposal.source_git_repository.git_identity,
+            logger.info('Merging git branch...')
+            self.git(['remote', '-v'])
+            self.git(['fetch', '-v', proposal.source_git_repository.git_identity,
                       proposal.source_git_path])
-            ret, out, err = self.git(['merge', '--no-ff', '--no-commit',
+            ret, out, err = self.git(['merge', '-v', '--no-ff', '--no-commit',
                                       proposal.reviewed_revid])
             if out == 'Already up-to-date.\n':
                 # There was nothing to merge