Open Stack

Hi-


With Zuul-Merger, for certain patches, I get the following error,


2014-05-26 14:34:08,987 DEBUG zuul.Merger: Merging for change 84072,7.
2014-05-26 14:34:08,987 DEBUG zuul.Merger: Processing refspec refs/changes/72/84072/7 for project openstack/neutron / master ref Zb61a061c0055435599c02aa7fc2476ba
2014-05-26 14:34:08,990 DEBUG zuul.Merger: Unable to find commit for ref master/Zb61a061c0055435599c02aa7fc2476ba
2014-05-26 14:34:08,990 DEBUG zuul.Merger: No base commit found for (u'openstack/neutron', u'master')
2014-05-26 14:34:08,991 DEBUG zuul.Repo: Resetting repository /var/lib/zuul/git/openstack/neutron
2014-05-26 14:34:08,992 DEBUG zuul.Repo: Updating repository /var/lib/zuul/git/openstack/neutron
2014-05-26 14:34:53,378 DEBUG zuul.Repo: Checking out 362e0bd0c545e1f27b2d79fe708430161c7aec2e
2014-05-26 14:36:39,155 DEBUG zuul.Repo: Merging refs/changes/72/84072/7 with args ['-s', 'resolve', 'FETCH_HEAD']
2014-05-26 14:36:39,184 DEBUG zuul.Merger: Unable to merge {u'oldrev': None, u'newrev': None, u'refspec': u'refs/changes/72/84072/7', u'merge_mode': 2, u'number': u'84072', u'project': u'openstack/neutron', u'url': u'ssh://freescale-ci@review.openstack.org:29418/openstack/neutron', u'branch': u'master', u'patchset': u'7', u'ref': u'Zb61a061c0055435599c02aa7fc2476ba'}
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 214, in _mergeChange
    commit = repo.merge(item['refspec'], 'resolve')
  File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 118, in merge
    repo.git.merge(*args)
  File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 227, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 456, in _call_process
    return self.execute(call, **_kwargs)
  File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 377, in execute
    raise GitCommandError(command, status, stderr_value)
GitCommandError: 'git merge -s resolve FETCH_HEAD' returned exit status 128:
*** Please tell me who you are.

Run

  git config --global user.email "you at example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident  <zuul at freescale-openstack-ci.(none)> not allowed

?
Certain patches go a smooth way.

Do I need to configure Zuul with some other parameters?

With this error, Zuul reports to gerrit with "Merge Failed" error.

Kindly help me resolve the issue.

-
Trinath

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-infra/attachments/20140526/52f1ea52/attachment.html>