[Buildbot-devel] git_buildbot too eager for merges

Dustin J. Mitchell dustin at v.igoro.us
Thu Apr 17 02:46:45 UTC 2014


This should be an option -- for users who *aren't* testing every
branch, the existing functionality might be desirable.

Dustin

On Tue, Apr 8, 2014 at 2:58 AM, Patrick Valsecchi <pvalsecc at cisco.com> wrote:
> Hi,
>
> OK, here is the scenario I'm encountering. The initial situation is:
>
>        master
>          |
> A--B--C--D
>  \-E--F
>       |
>     dev
>
> Everything is already pushed on the central git repository and Buildbot
> already tested every individual steps. I'm happy, everybody is happy.
>
> Then I come and do a merge of the dev branch into master:
>
>        master
>          |
> A--B--C--D--G
>  \-E--F-----/
>       |
>     dev
>
> The git_buildbot hook, as it is now in the buildbot repository (master
> branch) will trigger builds for the commits E, F and G. IMHO, it should not
> trigger commits for E and F since they are already tested and have not been
> pushed to the server.
>
> Now, imagine there was 30 commits in the dev branch and each build takes an
> hour. See my problem?
>
> In attachment, you'll find a proposed patch for that.
>
> Thanks.
>
> ------------------------------------------------------------------------------
> Put Bad Developers to Shame
> Dominate Development with Jenkins Continuous Integration
> Continuously Automate Build, Test & Deployment
> Start a new project now. Try Jenkins in the cloud.
> http://p.sf.net/sfu/13600_Cloudbees
> _______________________________________________
> Buildbot-devel mailing list
> Buildbot-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/buildbot-devel
>




More information about the devel mailing list