It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

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.

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
Posted in Off-topic

Do you still play the same games you played when you were a kid?

Months ago, I was walking in a huge grocery store and I went to the toys aisle and found a jigsaw puzzle that was more than 50% off, and I thought "why not? It will be fun and it can be a beautiful f...

222 views 21 10
Join discussion

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you