Here’s the Zuul error for this specific patch from the logs. Looks like Zuul reports back the “please rebase” message independently from the error it encounters. Given that, we’re looking into how to improve resiliency and error reporting.
Alessandro On 10 Feb 2014, at 12:45 , Gabriel Samfira <[email protected]> wrote: > 2014-02-09 20:09:12,190 INFO zuul.Gerrit: Updating information for 72197,1 > 2014-02-09 20:09:19,551 ERROR zuul.Merger: Unable to reset repo > <zuul.merger.Repo object at 0x1617c10> > Traceback (most recent call last): > File "/usr/local/lib/python2.7/dist-packages/zuul/merger.py", line 241, in > mergeChanges > repo.reset() > File "/usr/local/lib/python2.7/dist-packages/zuul/merger.py", line 71, in > reset > self.update() > File "/usr/local/lib/python2.7/dist-packages/zuul/merger.py", line 138, in > update > origin.update() > File "/usr/local/lib/python2.7/dist-packages/git/remote.py", line 510, in > update > self.repo.git.remote("update", self.name) > 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 remote update origin' returned exit status 1: ssh: > connect to host review.openstack.org port 29418: Network is unreachable > fatal: The remote end hung up unexpectedly > error: Could not fetch origin On 10 Feb 2014, at 04:21 , Alessandro Pilotti <[email protected]> wrote: > Hi guys, > > > On 10 Feb 2014, at 03:59 , Jay Pipes <[email protected]> wrote: > >> On Sun, 2014-02-09 at 18:17 -0700, Christopher Yeoh wrote: >>> Hi, >>> >>> >>> I think the hyper-v CI system is sometimes failing with this message >>> incorrectly: >>> >>> "This change was unable to be automatically merged with the current >>> state of the repository. Please rebase your change and upload a new >>> patchset." >>> >>> >>> I only mention it because its the second time I've seen it. An example >>> here: >>> >>> https://review.openstack.org/#/c/72197/ >>> >>> >>> The changeset was made off a very fresh git update and there doesn't >>> appear to be any updates merged since then. The last time this error >>> appeared for me the rebase had no conflicts and Jenkins did not have >>> any trouble testing the same patchset that the Hyper-V one failed to >>> merge. >> >> Yeah, it may not be a rebase issue at all. The problem may be that the >> failure-message setting on the Zuul pipeline that is being triggered or >> Jenkins Gerrit trigger plugin is set to the above message, regardless of >> whether the failure is indeed due to the failure of a rebase… >> > > Hi guys, looking into this. We had a similar issue some days ago due to a > corrupted Nova local git repo, which clearly had nothing to do with a rebase. > Checking out what’s going on this time. > >> Octavius, is it possible to pastebin your Zuul layout.yaml? >> > > Here’s the zuul layout that we’re using: > > https://github.com/cloudbase/ci-overcloud-init-scripts/blob/master/zuul_layout.yaml > >> Best, >> -jay >> >> >> >> >> >> _______________________________________________ >> OpenStack-dev mailing list >> [email protected] >> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev > > > _______________________________________________ > OpenStack-dev mailing list > [email protected] > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev _______________________________________________ OpenStack-dev mailing list [email protected] http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
