Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
x/build: trybots should rebase when testing #9858
Currently with the trybot code, if Go's master is A and we have pending CLs B and C on A, currently we test B-on-A and C-on-A, but then when B is merged, we're still testing C on A, instead of C-on-B.
We should do:
... which will add a patch set to the change, rebased. It could get spammy, though. Shawn says "don't complain when you have patch set 85 on a trivial one line change". So maybe we want to be careful when we do it. Maybe only for auto-submit.
We can always do git cherry-pick after git fetch the CL in trybot. Any failures in merging is a build failure (the CL won't submit successfully anyway) Even if rebase the CL on gerrit, each time its author updates the CL, the rebased patch set will be overwritten.
Sorry for the false alert. The problem I mentioned in the last comment is
Update: the actual reason is not me running on the wrong patch set.
So again, trybot should use rebase to test the patch in order to catch this
Trybot really should rebase before testing, two more cases:
changed the title from
build: trybots should rebase when testing
x/build: trybots should rebase when testing
Apr 14, 2015
Attempting to rebase completely breaks any testing of multi-CL changes, since the CL will be considered in isolation instead of the work that has come before. And at least some of us do pretty much nothing but multi-CL changes.
In the case of a commit hash where the parent is on origin/master (so it's either the bottom of or not part of a multi-CL change) then rebasing would be fine. But it's very important not to rebase otherwise, unless somehow you rebase the entire sequence.