Uploaded image for project: 'Bamboo Data Center'
  1. Bamboo Data Center
  2. BAM-12646

Add the functionality to trigger a build of the feature branch upon change in the master if auto-merging is applied

    • 1
    • 16
    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      Presently with the branch updater merging strategy, commits to master don`t trigger branches and as a result there is no auto trigger on the branches. It will be a good option to have such a feature.

      Workaround
      1. Create a new repository that points to the same master branch and set up that second master repository to trigger all the branches. I will attach screenshots to illustrate.
      2. Create a separate plan for the feature branch and set up build dependency

        1. first.jpg
          first.jpg
          125 kB
        2. second.jpg
          second.jpg
          97 kB
        3. third.jpg
          third.jpg
          106 kB

            [BAM-12646] Add the functionality to trigger a build of the feature branch upon change in the master if auto-merging is applied

            Atlassian Update

            Hi everyone,

            Thanks for your interest in this issue.
            This request is considered a potential addition to our longer-term roadmap.

            We'll typically review this request in about 6 months time, at which point we’ll consider whether we need to alter its status.

            For the nearest future we've decided to prioritise other areas of the Bamboo roadmap, including:

            1. Performance and stability improvements
            2. Providing building blocks for High Availability and Disaster Recovery solutions
            3. Improving permission system
            4. Allowing per-project allocation of resources
            5. Improving Bitbucket Server and Jira integrations

            You can learn more about our approach to highly voted server suggestions here.

            To learn more on how your suggestions are reviewed, see our updated workflow for server feature suggestions.

            Kind regards,
            Bamboo Team

            Krystian Brazulewicz added a comment - Atlassian Update Hi everyone, Thanks for your interest in this issue. This request is considered a potential addition to our longer-term roadmap. We'll typically review this request in about 6 months time, at which point we’ll consider whether we need to alter its status. For the nearest future we've decided to prioritise other areas of the Bamboo roadmap, including: Performance and stability improvements Providing building blocks for High Availability and Disaster Recovery solutions Improving permission system Allowing per-project allocation of resources Improving Bitbucket Server and Jira integrations You can learn more about our approach to highly voted server suggestions here . To learn more on how your suggestions are reviewed, see our updated workflow for server feature suggestions . Kind regards, Bamboo Team

            +1

            Jeremy Skinner added a comment - +1

            Please add the option to rebase issue (non-collaborative) branches when a parent branch changes. This is important functionality as releases remove (already applied) database patches which make a slew of feature branches undeployable when we update our development DB docker snapshot (we end up reapplying DB patches in "already patched" post-release deploys without the rebase).

            Matthew Korich added a comment - Please add the option to rebase issue (non-collaborative) branches when a parent branch changes. This is important functionality as releases remove (already applied) database patches which make a slew of feature branches undeployable when we update our development DB docker snapshot (we end up reapplying DB patches in "already patched" post-release deploys without the rebase).

            + for this feature request.
            It would be nice to auto update our feature branches from main integration branch, once the build is successful.
            Please update, when we expect this functionality.

            Thanks,
            -Saif

            Saifuddin Tariwala added a comment - + for this feature request. It would be nice to auto update our feature branches from main integration branch, once the build is successful. Please update, when we expect this functionality. Thanks, -Saif

            Really important to make this feature useable. The problem with the trigger approach is that builds triggered this way cannot be associated with a jira ticket (as no commit message is available), so this should also be adressed here.

            Stefan Siegl added a comment - Really important to make this feature useable. The problem with the trigger approach is that builds triggered this way cannot be associated with a jira ticket (as no commit message is available), so this should also be adressed here.

            +1

            Ivan Grcic added a comment - +1

            I've been dealing with this issue in BAM-13094.

            Having thought about it a bit more, I think the UI and functionality for the "Branch Updater" is not sufficient. It's a good idea (automatically update from master) but it seems the implementation in lacking (in this issue and BAM-13094, it's not actually updating from master ... frequently enough).

            Bamboo should implement (I feel) not "Branch Update from xxx" (intuitively, one would think xxx would be master) but "Branch Update from Parent". So, if we're using the terminology from Gitflow, an example would be:

            • Branches from master (Develop branches) would being updated when there is a change in master
            • Branches from Develop branches (Feature branches) would be updated when there is a change in its parent Develop branch
            • If a change occurred in master it would cascade out to the feature branches (by first being merged into their parent Develop branches)
            • If a change was limited to a Develop branch, then Bamboo would update only the Feature branches

            Assuming Bamboo did update branches frequently enough from master, without the above you still run the risk of your feature branches drifting away from its parent Develop branch.

            Todd Aspeotis added a comment - I've been dealing with this issue in BAM-13094 . Having thought about it a bit more, I think the UI and functionality for the "Branch Updater" is not sufficient. It's a good idea (automatically update from master) but it seems the implementation in lacking (in this issue and BAM-13094 , it's not actually updating from master ... frequently enough). Bamboo should implement (I feel) not "Branch Update from xxx" (intuitively, one would think xxx would be master) but "Branch Update from Parent". So, if we're using the terminology from Gitflow , an example would be: Branches from master (Develop branches) would being updated when there is a change in master Branches from Develop branches (Feature branches) would be updated when there is a change in its parent Develop branch If a change occurred in master it would cascade out to the feature branches (by first being merged into their parent Develop branches) If a change was limited to a Develop branch, then Bamboo would update only the Feature branches Assuming Bamboo did update branches frequently enough from master, without the above you still run the risk of your feature branches drifting away from its parent Develop branch.

            Matt Smith added a comment -

            As a note, in case you missed it, my origin is a stash repo running stash 2.1.2 and I'm running bamboo on another server on 4.4.3. Git connection is using SSH through the stash SSH url

            Matt Smith added a comment - As a note, in case you missed it, my origin is a stash repo running stash 2.1.2 and I'm running bamboo on another server on 4.4.3. Git connection is using SSH through the stash SSH url

            Matt Smith added a comment -

            Hi Piotr,

            It was previously not ticked, so I've just tried with it ticked, got all the branches on to the same revision locally and most importantly, remotely, but now 4 of the 11 builds failed.

            Again I can clearly see that they start from the same commit and are trying to merge in the same commit, but one branch fails and one succeeds

            Matt Smith added a comment - Hi Piotr, It was previously not ticked, so I've just tried with it ticked, got all the branches on to the same revision locally and most importantly, remotely, but now 4 of the 11 builds failed. Again I can clearly see that they start from the same commit and are trying to merge in the same commit, but one branch fails and one succeeds

            PiotrA added a comment -

            Hm... Sam, do you use "Force Clean Build" option in your Source Code Checkout task? I'm not sure if this is relevant, but I'd like to know that bit of information before troubleshooting this issue.

            regards

            PiotrA added a comment - Hm... Sam, do you use "Force Clean Build" option in your Source Code Checkout task? I'm not sure if this is relevant, but I'd like to know that bit of information before troubleshooting this issue. regards

              Unassigned Unassigned
              smaiyaki Sultan Maiyaki (Inactive)
              Votes:
              38 Vote for this issue
              Watchers:
              35 Start watching this issue

                Created:
                Updated: