Branch merging with gatekeeper and push on causes git failures with concurrent builds

We have a plan setup to do CI - it monitors the master branch of a Git repository with branch merging enabled, using the gatekeeper strategy and we have multiple agents enabled so we can build multiple plans. This works fine when different plans are building, but bamboo will build multiple branches of a plan and invariably, one of them will not push to the remote because it is behind the tip due to the other. Bamboo should not build multiple branches that have push enabled.

2 answers

This widget could not be displayed.

Just wondering if anyone figured this scenario out? We hit it today and are wondering how to resolve this. Right now we allocated the entire plan to only use a single remote agent to force serialization, but that is sub-optimal in scenarios where the agent is offline, etc.

This widget could not be displayed.

We just aren't doing this anymore, especially since we're using pull requests in Stash with the auto-merge from release branches down to newer versions. We do still let Bamboo build other branches, and we require that they have 1+ successful build before we allow the merge.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Monday in Teamwork

The tools we make for teams? We use them every day at Atlassian to get shit done (and it works).

I’m Jess, a Product Marketer for Jira Software Server and Data Center, and now a huge fan of our products. Read on for a 90 day, new-hire perspective on what it’s like to standardize on the Atlassian...

40 views 0 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you