Last modified: 2014-10-06 09:52:16 UTC
Steps to reproduce: 1. git fetch gerrit refs/meta/dashboards/custom 2. git checkout FETCH_HEAD 3. change stuff & commit 4. git push gerrit HEAD:refs/for/refs/meta/dashboards/custom This pushes a new changeset into gerrit's special dashboard branch (refs/meta/dashboards/custom). Could be done via git-review as well, but in my experience it is not very reliable with gerrit's special config branches. (Might be setting up things wrong - I described the setup steps in detail here: http://lists.wikimedia.org/pipermail/multimedia/2014-April/000272.html ) Expected result: jenkins-bot ignores the change or marks as +2 Actual result: jenkins-bot marks as -2, claims a merge conflict (maybe tries to merge into the wrong branch?) Example: https://gerrit.wikimedia.org/r/#/c/130643/
Looks like a dupe of bug 50389 - Jenkins: Zuul should not run jenkins-bot on changes for refs/meta/* I am not sure how to fix it in Zuul. Any idea welcome!
Created attachment 15257 [details] Zuul debug log showing it can't merge Attached is related Zuul debug log for Gerrit change #130643 That is missing the git command being run and their output :-/
Looking at the source code [1] it seems that Zuul requests commit 46616c7365 from git and it does not exist. Which is weird - if the merge was unsuccessful, why did it return a commit id? (And if it was successful, why is it not found?) [1] https://github.com/gitpython-developers/GitPython/blob/0.3.2-RC1/git/repo/fun.py#L79
The actual git command used seems to be "git cat-file --batch-check" with "46616c7365" as standard input. (Of course the interesting part would be the git command used to merge, and I have no clue about that.)
*** This bug has been marked as a duplicate of bug 50389 ***
