Build break after Remote Runs

My Builds are breaking soon after the Remote Run commits the files to CVS.  

The next build which runs due the CVS trigger always ends up in some merge issue and build fails because of that.  

Is there a way to avoid this?

11 comments

Hello,

Actually, I do not fully understand the problem. Can you please provide more details on the issue? What is the specific problem? Do you experience it with usual commit?

Thanks,
Marina

0

I have build config which has VCS trigger with quite period of 300s. When developers submit for Remote Runs and check the option for "Commit after Successful Build", after successful commit when the build for check-in starts the agent checks-out the files and  end up in a merge issue.  Below is the error I get after the CVS check-in


[17:49:05]: [VCS Root: xxx] rcsmerge: warning: conflicts during merge

0

Hello,

Thanks for the clarification!

This is known issue fixed in 5.1.1, please refer to http://youtrack.jetbrains.net/issue/TW-7954.

For earlier versions it is possible to define 'teamicty.personal.patch.timestamp.revert' build system property or agent property with value 'false' to make build agent do not recover last write time on personal patch revert.

Hope this help,
Marina

0

I am using 5.1.2 (build 13430) still I see the issue.

I will try setting the property.

0

Please let me know if this helps.

Thanks,
Marina

0

I tried the option, still my build is failing after a personal build.

-Karthik

0

To revert timestamps 'teamicty.personal.patch.timestamp.revert' sould be set as "true". Could you please try again using the property.
If it is not help please provide build log.

Sorry for the inconvenience,
Marina

0

Did not help.  Attached is the build log 1303 is the personal build which succeeded and 1304 is the actual build which failed due to merge issue


-Karthik



Attachment(s):
CommCell_Console_LatestGUI_9.0.1304.log.zip
CommCell_Console_LatestGUI_9.0.1303.log.zip
0

Karthik,

Could you please do the following:
- Attach idmap.properties file that could be find in .BuildServer/systempluginData/customDataStorage/buildTypes/<btID> folder (<btID> is internal ID of build configuration).
- Stop the server and clean folder .BuildServer/systempluginData/customDataStorage/buildTypes/<btID>
- Start server.
Also please attach all VCS roots and checkout rules used in the build configuration.

Thanks,
Marina

0

Please sign in to leave a comment.