<div dir="ltr">Hi the merge fail error that we reported in ubuntu 12.04 has been solved in the new ubuntu 14.04 CI master setup.<div><br></div><div>many thanks to ramy on the update of the repo :) <a href="https://github.com/rasselin/os-ext-testing">https://github.com/rasselin/os-ext-testing</a></div><div><br></div><div>cheers!</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 8, 2015 at 7:16 PM, Punith S <span dir="ltr"><<a href="mailto:punith.s@cloudbyte.com" target="_blank">punith.s@cloudbyte.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">hi,<div><br></div><div>i'm running CI for openstack cinder patches, when zuul reads a new patch from gerrit, it tries to merge the patch to it's own cinder repo @/var/lib/zuul/git/openstack/cinder</div><div><br></div><div>and returns the comment to gerrit saying </div><div><br></div><div><img src="cid:ii_i4o6pi8z0_14ac9c8169619fa8" width="454" height="76"></div><div><br></div><div>hence it is failing to issue the dsvm-tempest-job in jenkins via gearman !!!<br><br clear="all"><div>the zuul/merger-debug log sanpshot<br><br></div><div><div><br></div><div>2015-01-08 19:03:43,320 DEBUG zuul.MergeServer: Got merge job.</div><div>2015-01-08 19:03:43,321 DEBUG zuul.Merger: Merging for change 145778,1.</div><div>2015-01-08 19:03:43,321 DEBUG zuul.Merger: Processing refspec refs/changes/78/145778/1 for project openstack/cinder / master ref Zbd4a4ad6ff3741c68ce382afa6d8df84</div><div>2015-01-08 19:03:43,383 DEBUG zuul.Merger: Unable to find commit for ref master/Zbd4a4ad6ff3741c68ce382afa6d8df84</div><div>2015-01-08 19:03:43,384 DEBUG zuul.Merger: No base commit found for (u'openstack/cinder', u'master')</div><div>2015-01-08 19:03:43,384 DEBUG zuul.Repo: Resetting repository /var/lib/zuul/git/openstack/cinder</div><div>2015-01-08 19:03:43,385 DEBUG zuul.Repo: Updating repository /var/lib/zuul/git/openstack/cinder</div><div>2015-01-08 19:03:54,507 DEBUG zuul.Repo: Checking out 5993660498f44e96b0f35ccc0f4d4a4c7b430363</div><div>2015-01-08 19:04:02,685 ERROR zuul.Merger: Exception while merging a change:</div><div>Traceback (most recent call last):</div><div> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 234, in _mergeChange</div><div> commit = repo.merge(item['refspec'], 'resolve')</div><div> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 132, in merge</div><div> self.fetch(ref)</div><div> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 145, in fetch</div><div> origin.fetch(ref)</div><div> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 598, in fetch</div><div> return self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())</div><div> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 540, in _get_fetch_info_from_stderr</div><div> for err_line, fetch_line in zip(fetch_info_lines, fetch_head_info))</div><div> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 540, in <genexpr></div><div> for err_line, fetch_line in zip(fetch_info_lines, fetch_head_info))</div><div> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 252, in _from_line</div><div> raise ValueError("Failed to parse line: %r" % line)</div><div>ValueError: Failed to parse line: 'Total 7 (delta 5), reused 7 (delta 5)'</div></div><div><br></div><div><br></div><div>is this a problem of python git ?</div><div><br></div><div>i'm using ubuntu 12.04 and git 1.7</div><div><br></div><div><br></div><div>thanks in advance</div><span class="HOEnZb"><font color="#888888">-- <br><div><div dir="ltr">regards,<div><br></div><div>punith s</div><div><a href="http://cloudbyte.com" target="_blank">cloudbyte.com</a></div></div></div>
</font></span></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">regards,<div><br></div><div>punith s</div><div><a href="http://cloudbyte.com" target="_blank">cloudbyte.com</a></div></div></div>
</div>