![]() |
|
|
|
|
Issue Type:
|
![Bug]() Bug
|
|
Affects Versions:
|
current |
|
Assignee:
|
Nicolas De Loof
|
|
Components:
|
git, plugin |
|
Created:
|
17/Apr/13 1:16 PM
|
|
Description:
|
When git-plugin is configured to use the integration branch feature and the there are multiple candidate revisions and the merge fails an endless number of builds are scheduled. As you can see from the log below and new build is scheduled before the merge fails. And the new scheduled build will schedule a new build and fail for the exact same reason.... Endless loop....
The build is configured to merge all branches matching /order/* and /bug/* into project/man/integration464 branch
Here's the log from jenkins build:
15:03:52 Started by an SCM change
15:03:52 Building on master in workspace C:\Users\.hudson\jobs\Test Git integration branch\workspace
15:03:52 Checkout:workspace / C:\Users\.hudson\jobs\Test Git integration branch\workspace - hudson.remoting.LocalChannel@21777ce4
15:03:52 Using strategy: Default
15:03:52 Last Built Revision: Revision e1a5d142152e8fbcf6248cbe939d402dcca776d4 (origin/order/148)
15:03:52 Fetching changes from 1 remote Git repository
15:03:52 Fetching upstream changes from origin
15:03:54 Pruning obsolete local branches
15:03:54 Seen branch in repository origin/HEAD
15:03:54 Seen branch in repository origin/bug/10825
15:03:54 Seen branch in repository origin/bug/10827
15:03:54 Seen branch in repository origin/master
15:03:54 Seen branch in repository origin/order/148
15:03:54 Seen branch in repository origin/order/149
15:03:54 Seen branch in repository origin/order/150
15:03:54 Seen branch in repository origin/order/151
15:03:54 Seen branch in repository origin/order/152
15:03:54 Seen branch in repository origin/order/153
15:03:54 Seen branch in repository origin/project/man/integration464
15:03:54 Multiple candidate revisions
15:03:54 Scheduling another build to catch up with Test Git integration branch
15:03:54 Commencing build of Revision 7ca6fe365e8a5eff214456b2b0c7575bc8ec2da8 (origin/order/153)
15:03:54 Merging Revision 7ca6fe365e8a5eff214456b2b0c7575bc8ec2da8 (origin/order/153) onto project/man/integration464
15:03:58 ERROR: Branch not suitable for integration as it does not merge cleanly
15:03:58 [WARNINGS] Parsing warnings in console log with parser Java Compiler (javac)
15:03:58 Archiving artifacts
15:03:58 Recording fingerprints
15:03:58 Description set:
15:03:58 Build did not succeed and the project is configured to only push after a successful build, so no pushing will occur.
15:03:58 Sending e-mails to: x...@xxxxxxx.com
15:03:59 Finished: FAILURE
|
|
Environment:
|
windows x64
java 1.7.0_17
|
|
Project:
|
Jenkins
|
|
Priority:
|
![Critical]() Critical
|
|
Reporter:
|
Mattias Andersson
|
|
|
|
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
|
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit
https://groups.google.com/groups/opt_out.
