Log merge errors (at level DEBUG).
Change-Id: If1c43a2965c30e56b09a6cf85bcf8959c67d62c6 Reviewed-on: https://review.openstack.org/15927 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
14b5537607
commit
554ba5431f
|
@ -152,6 +152,7 @@ class Merger(object):
|
||||||
except:
|
except:
|
||||||
self.log.exception("Unable to checkout %s" % change.branch)
|
self.log.exception("Unable to checkout %s" % change.branch)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if not mode:
|
if not mode:
|
||||||
mode = change.project.merge_mode
|
mode = change.project.merge_mode
|
||||||
|
@ -159,13 +160,21 @@ class Merger(object):
|
||||||
repo.merge(change.refspec)
|
repo.merge(change.refspec)
|
||||||
elif mode == model.CHERRY_PICK:
|
elif mode == model.CHERRY_PICK:
|
||||||
repo.cherryPick(change.refspec)
|
repo.cherryPick(change.refspec)
|
||||||
|
except:
|
||||||
|
# Log exceptions at debug level because they are
|
||||||
|
# usually benign merge conflicts
|
||||||
|
self.log.debug("Unable to merge %s" % change, exc_info=True)
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
# Keep track of the last commit, it's the commit that
|
# Keep track of the last commit, it's the commit that
|
||||||
# will be passed to jenkins because it's the commit
|
# will be passed to jenkins because it's the commit
|
||||||
# for the triggering change
|
# for the triggering change
|
||||||
commit = repo.setZuulRef(change.branch + '/' + target_ref,
|
zuul_ref = change.branch + '/' + target_ref
|
||||||
'HEAD').hexsha
|
commit = repo.setZuulRef(zuul_ref, 'HEAD').hexsha
|
||||||
except:
|
except:
|
||||||
self.log.info("Unable to merge %s" % change)
|
self.log.exception("Unable to set zuul ref %s for change %s" %
|
||||||
|
(zuul_ref, change))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.push_refs:
|
if self.push_refs:
|
||||||
|
|
Loading…
Reference in New Issue