Problem with Feature branches

Hi,

First of all, thank you for adding support for feature branches. I've been trying various setup all day but i'm having a hard time getting it to work.

My setup is quite simpe : one shared VCS root (git), 3 configs (all maven based) : compile, inspections, find duplicates.

Here are the problems I have encountered when following the explanation in the release notes :

1. It doesn't work when using checkout on agent, error message says that the commit is not present in the repository. When I check the agent-managed repo, the feature branches are not listed in ref/heads, only in ref/remotes/origin. Looks like a "git checkout" is missing here. Exact message:
[Updating sources] Failed  to perform checkout on agent: The revision  223afe9b7cb71dac3d7b97e26ac45a5c133fe03b is not found in the repository  after fetch (demeter,  E:\TeamCity\TeamCity7.1-23732\buildAgent\work\a49a8e699dde9ea3,sghub:demeter)

2. First, I used templates for each config, with the VCS root attached to each template. As soon as I added +=refs/head/* to the branches field in the VCS conf, I suddenly a lot of items in the build queue with lots of duplicates, growing each 10 seconds or so. I stopped and cleared everything when it reached 500 items !

3. Now it seems to work, but the builds on feature branches are triggered only by VCS change. I can't force them to build by using a custom build with the "..." button and specifying <all branches> in the Changes tab. It will only build the Default branch I declared in the VCS root. So, there are pending changes though which seems to be the union of the commits of the feature branches that haven't been built.

Gilles

2 comments
Comment actions Permalink

Hi Gilles,

thanks for feedback.

Here is an issue for agent-side checkout: http://youtrack.jetbrains.com/issue/TW-22369.

> 2. First, I used templates for each config, with the VCS root attached to each template. As soon as I added +=refs/head/* to the branches field in the VCS conf, I suddenly a lot of items in the build queue with lots of duplicates, growing each 10 seconds or so. I stopped and cleared everything when it reached 500 items !

Do you have per-checking triggering enabled in the VCS trigger settings?

> 3. Now it seems to work, but the builds on feature branches are triggered only by VCS change. I can't force them to build by using a custom build with the "..." button and specifying <all branches> in the Changes tab. It will only build the Default branch I declared in the VCS root. So, there are pending changes though which seems to be the union of the commits of the feature branches that haven't been built.

Are you trying to run multiple builds in several branches using this dialog? This is not supported, at least yet. "Branches" in the dialog acts a filter for commits list that comes below it. When you select particular branch - only commits from this branch are shown. When <All branches> is selected - commits from all the branches are shown. So you can run build on any commit using this dialog.

0
Comment actions Permalink

Please give a try to the latest nightly build:
ftp://ftp.intellij.net/pub/.teamcity/nightly/

Build #23775.

It should have feature branches support fixed for the case when agent checkout is used. And custom build dialog now works better with branches as well.

0

Please sign in to leave a comment.