<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<!--[if !mso]><style>v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style><![endif]--><style><!--
/* Font Definitions */
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.hoenzb
{mso-style-name:hoenzb;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D">FYI, it wasn’t a change to my repo, but to openstack upstream that solved the 12.04
</span><span style="font-size:11.0pt;font-family:Wingdings;color:#1F497D">à</span><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D"> 14.04 issue:
<a href="https://review.openstack.org/#/c/141518/">https://review.openstack.org/#/c/141518/</a><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D">So this will help anyone using the Openstack-Infra zuul puppet modules!
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D">Ramy<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Punith S [mailto:punith.s@cloudbyte.com]
<br>
<b>Sent:</b> Tuesday, January 27, 2015 4:32 AM<br>
<b>To:</b> openstack-infra@lists.openstack.org; OpenStack Development Mailing List (not for usage questions)<br>
<b>Cc:</b> Asselin, Ramy<br>
<b>Subject:</b> Re: [Openstack][infra] Zuul-Merger Error in CI<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">Hi the merge fail error that we reported in ubuntu 12.04 has been solved in the new ubuntu 14.04 CI master setup.<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">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><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">cheers!<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On Thu, Jan 8, 2015 at 7:16 PM, Punith S <<a href="mailto:punith.s@cloudbyte.com" target="_blank">punith.s@cloudbyte.com</a>> wrote:<o:p></o:p></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<div>
<p class="MsoNormal">hi,<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">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<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">and returns the comment to gerrit saying <o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><img border="0" width="454" height="76" id="_x0000_i1025" src="cid:image001.jpg@01D03A03.B7884B60"><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">hence it is failing to issue the dsvm-tempest-job in jenkins via gearman !!!<br>
<br clear="all">
<o:p></o:p></p>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt">the zuul/merger-debug log sanpshot<o:p></o:p></p>
</div>
<div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:43,320 DEBUG zuul.MergeServer: Got merge job.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:43,321 DEBUG zuul.Merger: Merging for change 145778,1.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:43,321 DEBUG zuul.Merger: Processing refspec refs/changes/78/145778/1 for project openstack/cinder / master ref Zbd4a4ad6ff3741c68ce382afa6d8df84<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:43,383 DEBUG zuul.Merger: Unable to find commit for ref master/Zbd4a4ad6ff3741c68ce382afa6d8df84<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:43,384 DEBUG zuul.Merger: No base commit found for (u'openstack/cinder', u'master')<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:43,384 DEBUG zuul.Repo: Resetting repository /var/lib/zuul/git/openstack/cinder<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:43,385 DEBUG zuul.Repo: Updating repository /var/lib/zuul/git/openstack/cinder<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:03:54,507 DEBUG zuul.Repo: Checking out 5993660498f44e96b0f35ccc0f4d4a4c7b430363<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2015-01-08 19:04:02,685 ERROR zuul.Merger: Exception while merging a change:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Traceback (most recent call last):<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 234, in _mergeChange<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> commit = repo.merge(item['refspec'], 'resolve')<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 132, in merge<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> self.fetch(ref)<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 145, in fetch<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> origin.fetch(ref)<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 598, in fetch<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> return self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 540, in _get_fetch_info_from_stderr<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> for err_line, fetch_line in zip(fetch_info_lines, fetch_head_info))<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 540, in <genexpr><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> for err_line, fetch_line in zip(fetch_info_lines, fetch_head_info))<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 252, in _from_line<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> raise ValueError("Failed to parse line: %r" % line)<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">ValueError: Failed to parse line: 'Total 7 (delta 5), reused 7 (delta 5)'<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">is this a problem of python git ?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">i'm using ubuntu 12.04 and git 1.7<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">thanks in advance<o:p></o:p></p>
</div>
<p class="MsoNormal"><span class="hoenzb"><span style="color:#888888">-- <o:p></o:p></span></span></p>
<div>
<div>
<p class="MsoNormal"><span style="color:#888888">regards,</span><o:p></o:p></p>
<div>
<p class="MsoNormal"><span style="color:#888888"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#888888">punith s<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#888888"><a href="http://cloudbyte.com" target="_blank">cloudbyte.com</a><o:p></o:p></span></p>
</div>
</div>
</div>
</div>
</div>
</blockquote>
</div>
<p class="MsoNormal"><br>
<br clear="all">
<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<p class="MsoNormal">-- <o:p></o:p></p>
<div>
<div>
<p class="MsoNormal">regards,<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">punith s<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><a href="http://cloudbyte.com" target="_blank">cloudbyte.com</a><o:p></o:p></p>
</div>
</div>
</div>
</div>
</div>
</body>
</html>