Page MenuHomePhabricator

operations/software.git commits failing as unable to merge?
Closed, ResolvedPublic

Event Timeline

Restricted Application added subscribers: Zppix, Aklapper. · View Herald TranscriptJun 23 2016, 12:16 AM
hashar closed this task as Resolved.Jun 23 2016, 7:50 AM

That is a bug in the Zuul merger, the reason is it tries to clone operations/software when another repo such as operations/software/conftool has already been created. Since the directory operations/software already exists, git clone bails out.

Fix:

ssh scandium.eqiad.wmnet
sudo -H -u zuul bash -l
cd /srv/ssd/zuul/git/operations/software
git init .
git remote add origin ssh://jenkins-bot@ytterbium.wikimedia.org:29418/operations/software
git remote set-head origin --auto

Did a recheck and zuul merger now manages to merge the patches properly. Thank you for the task filling!

Absolutely unrelated, that commit change the behavior of the Zuul cloner which clone repositories on the Jenkins slaves :-D

Thanks @hashar, especially for explaining your fix here (even though I can't run those commands myself).