I'm using Buildbot for integration testing and deployment for my project and I'm having trouble with a specific case.
I've configured it to run all unit tests when pushing to branch "devel", and I've configured it to cross compile and deploy to all platforms when pushing to branch "master".
Here's an excerpt from my config file:
# schedulers for push events to devel and master branches
c['schedulers'].append(basic.SingleBranchScheduler(name="checkin-devel",
change_filter=filter.ChangeFilter(branch="devel"),
treeStableTimer=2,
builderNames=["test-gameserver", "test-applebloom"]))
c['schedulers'].append(basic.SingleBranchScheduler(name="checkin-master",
change_filter=filter.ChangeFilter(branch="master"),
treeStableTimer=2,
builderNames=["deploy-gameserver", "deploy-applebloom"]))
# when pushing to master, checkout, cross compile for all platforms, test, and upload to /www/game/lightship
# gameserver ###################
factory = util.BuildFactory()
factory.addStep(step_checkout_master)
factory.addStep(step_test_build_linux)
factory.addStep(step_test_linux)
factory.addStep(step_compile_x86_64_linux)
factory.addStep(step_cross_x86_64_windows)
factory.addStep(step_cross_i686_windows)
factory.addStep(step_upload_dist)
factory.addStep(step_clean_dist)
c['builders'].append(util.BuilderConfig(
name="deploy-gameserver",
slavenames=["slave-lightship-gameserver"],
factory=factory))
# applebloom ###################
factory = util.BuildFactory()
factory.addStep(step_checkout_master)
factory.addStep(step_test_build_macosx)
factory.addStep(step_test_macosx)
factory.addStep(step_compile_x86_64_macosx)
factory.addStep(step_upload_dist)
factory.addStep(step_clean_dist)
c['builders'].append(util.BuilderConfig(
name="deploy-applebloom",
slavenames=["slave-lightship-applebloom"],
factory=factory))
# when pushing to devel, checkout and test
# gameserver ###################
factory = util.BuildFactory()
factory.addStep(step_checkout_devel)
factory.addStep(step_test_build_linux)
factory.addStep(step_test_linux)
c['builders'].append(util.BuilderConfig(
name="test-gameserver",
slavenames=["slave-lightship-gameserver"],
factory=factory))
# applebloom ###################
factory = util.BuildFactory()
factory.addStep(step_checkout_devel)
factory.addStep(step_test_build_macosx)
factory.addStep(step_test_macosx)
c['builders'].append(util.BuilderConfig(
name="test-applebloom",
slavenames=["slave-lightship-applebloom"],
factory=factory))The problem occurs when merging branch "devel" into "master" and pushing master. Because the HEAD of both branches have the same commit hash at this point, Buildbot decides to not build master even though I want it to. Here's the log file for this exact case:
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] X-GitHub-Event: 'push'
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] Commit `7ce18ba601b0ee69973a64b73e25bcf5fe8ff0c6` is a non-distinct commit, ignoring...
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] Commit `3db1b8da4997c9cf1389acfe394b73d3ddc21072` is a non-distinct commit, ignoring...
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] Commit `af4ddab0b4db92ca3b40bc4a0df7ea7598ae490b` is a non-distinct commit, ignoring...
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] Received 0 changes from github
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] Got the following changes []
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] Payload: {}
2015-06-01 12:40:34+0200 [HTTPChannel,0,127.0.0.1] No changes found
How can I force Buildbot to build every push that goes to master?
