Merge way to —no-ff in gatekeeper

Hi guys!

We need to automate our releasing process with Bamboo and Jira.
In Jira we have issues with names like PREFIX-<number>. GIT branches with the same name for each issue.
Our git flow: stable master branch and feature branches starting from last stable master tag (last release). For new release "release branch” is created from master and feature branches merges with —no-ft into it. Bamboo builds all branches on every push. When release branch build is ok branch is manually merging to master and deploying to production.
What we need:
When developer changes issue status to Ready To Release in Jira feature-branch merges to release-branch with —no-ft and pushes to repository.
Bamboo builds release-branch and if it’s OK release manager can merge release-branch to master and deploy code manually.
If it’s not OK merge aborts and issue status changes to Not Ready To Release.
Atlassian tools described in documentation are not enough for us.
Jira Versions doesn’t trigger merge and push of multiple branches into release-branch.
Bamboo Automatic Branch Merging Gatekeeper merges branch with fast forward, but it neccesary to keep merge commits (—no-ff option is important). And it’s necessary to change Jira issue status if merge fail in Bamboo.
Does any atlassian tool can do it?
Is it possible to change merge way to —no-ff in gatekeeper?
May be there is another solution for our needs?
Thanks.

1 answer

0 votes

The only way to get no-ff is to modify the plugin: https://bitbucket.org/atlassian/bamboo-git-plugin

and install it into Bamboo. It's really easy.

Suggest an answer

Log in or Join to answer
Community showcase
Renan Battaglin
Published May 18, 2017 in Bamboo

FAQ: How to Upgrade Bamboo Server

Bamboo 5.9 will no longer be supported after June 12, 2017. What does this mean? As part of our End of Life policy, Atlassian supports major versions for two years after the first major iteratio...

1,067 views 0 5
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot