You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by Apache Jenkins Server <je...@builds.apache.org> on 2014/10/01 23:51:01 UTC
Build failed in Jenkins: incubator-brooklyn-pull-requests #4
See <https://builds.apache.org/job/incubator-brooklyn-pull-requests/4/>
------------------------------------------
GitHub pull request #165 to apache/incubator-brooklyn
Building remotely on ubuntu-4 (Ubuntu ubuntu4 ubuntu) in workspace <https://builds.apache.org/job/incubator-brooklyn-pull-requests/ws/>
Cloning the remote Git repository
Cloning repository git://github.com/apache/incubator-brooklyn.git
> git init <https://builds.apache.org/job/incubator-brooklyn-pull-requests/ws/>
Fetching upstream changes from git://github.com/apache/incubator-brooklyn.git
> git --version
> git fetch --tags --progress git://github.com/apache/incubator-brooklyn.git +refs/heads/*:refs/remotes/origin/*
> git config remote.origin.url git://github.com/apache/incubator-brooklyn.git
> git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
> git config remote.origin.url git://github.com/apache/incubator-brooklyn.git
Fetching upstream changes from git://github.com/apache/incubator-brooklyn.git
> git fetch --tags --progress git://github.com/apache/incubator-brooklyn.git +refs/heads/*:refs/remotes/origin/*
> git config core.sparsecheckout
> git checkout -f origin/master
> git branch -a
> git rev-parse remotes/origin/0.4^{commit}
> git rev-parse remotes/origin/0.4.0^{commit}
> git rev-parse remotes/origin/0.4.0-M1^{commit}
> git rev-parse remotes/origin/0.4.0-M2^{commit}
> git rev-parse remotes/origin/0.4.0-rc.1^{commit}
> git rev-parse remotes/origin/0.4.0-rc.2^{commit}
> git rev-parse remotes/origin/0.5^{commit}
> git rev-parse remotes/origin/0.5.0^{commit}
> git rev-parse remotes/origin/0.5.0-M1^{commit}
> git rev-parse remotes/origin/0.5.0-M2^{commit}
> git rev-parse remotes/origin/0.5.0-rc.1^{commit}
> git rev-parse remotes/origin/0.5.0-rc.2^{commit}
> git rev-parse remotes/origin/0.6.0^{commit}
> git rev-parse remotes/origin/0.6.0-M1^{commit}
> git rev-parse remotes/origin/0.6.0-M2^{commit}
> git rev-parse remotes/origin/0.6.0-rc.1^{commit}
> git rev-parse remotes/origin/0.6.0-rc.2^{commit}
> git rev-parse remotes/origin/0.6.0-rc.3^{commit}
> git rev-parse remotes/origin/0.6.0-rc.4^{commit}
> git rev-parse remotes/origin/0.6.x^{commit}
> git rev-parse remotes/origin/0.7.0-M1^{commit}
> git rev-parse remotes/origin/0.7.0-M1-amp-2.0.0-M1^{commit}
> git rev-parse remotes/origin/feature/policy-persistence^{commit}
> git rev-parse remotes/origin/feature/storage2^{commit}
> git rev-parse remotes/origin/master^{commit}
> git checkout -b master origin/master
Opening connection
Done: 0
Counting objects
Done: 163
Finding sources
Done: 163
Getting sizes
Done: 111
Compressing objects
Done: 49009
Writing objects
Done: 163
remote: Resolving deltas
remote: Updating references
Merging refs/tags/changes/4
> git rev-parse refs/tags/changes/4^{commit}
> git merge 2e968dd8e6b67dbd598f007b02479dab88663b93
FATAL: Could not merge AnyObjectId[2e968dd8e6b67dbd598f007b02479dab88663b93]
hudson.plugins.git.GitException: Could not merge AnyObjectId[2e968dd8e6b67dbd598f007b02479dab88663b93]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:446)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:76)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:87)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:299)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
Caused by: hudson.plugins.git.GitException: Command "git merge 2e968dd8e6b67dbd598f007b02479dab88663b93" returned status code 1:
stdout: Auto-merging core/src/main/java/brooklyn/util/file/ArchiveUtils.java
CONFLICT (content): Merge conflict in core/src/main/java/brooklyn/util/file/ArchiveUtils.java
Auto-merging core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1301)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1277)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1273)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1078)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1088)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:444)
... 17 more
Build failed in Jenkins: incubator-brooklyn-pull-requests #6
Posted by Apache Jenkins Server <je...@builds.apache.org>.
See <https://builds.apache.org/job/incubator-brooklyn-pull-requests/6/changes>
Changes:
[grkvlt] Added install resources configuration as complement to runtime resources
[grkvlt] Copy install resources with relative paths to installDir
[grkvlt] Tidy up copyResource and copyTemplate methods
[grkvlt] Update names and Javadoc comment documentation for resource copy phases
[grkvlt] Change reported task names for symmetry
[grkvlt] Record stdout and stderr when executing commands in tasks
[grkvlt] Added test for install and runtime file copy
[grkvlt] Add logging on exceptions propagation and use unchecked interrupted exception for mutex
[grkvlt] Configuration for files used as resources in tests
------------------------------------------
[...truncated 13108 lines...]
[GC 289924K->65100K(762880K), 0.0609060 secs]
2014-10-01 22:37:53,777 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[1] @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:J5hR4juM] is being finalized before completion
2014-10-01 22:37:53,777 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[2] @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:l9tvPYRq] is being finalized before completion
2014-10-01 22:37:53,777 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[3] @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:qUfGNOBU] is being finalized before completion
2014-10-01 22:37:53,777 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[4] @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:Gn10uf1p] is being finalized before completion
2014-10-01 22:37:53,778 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=DynamicGroupImpl{id=Jc6tFmce} @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:x3jcdZBm] is being finalized before completion
2014-10-01 22:37:53,778 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=BalanceableWorkerPoolImpl{id=wqYqlHVr} @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:vKVdXpGb] is being finalized before completion
2014-10-01 22:37:53,778 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockContainer[A] @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:twb7W1Rb] is being finalized before completion
2014-10-01 22:37:53,778 WARN Task Task[LSM.publish(Application[sxBpZGuW].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockContainer[B] @ 1412203073001);[subscription-delivery-entity-sxBpZGuW[Application[sxBpZGuW]]]:fMEEjb7o] is being finalized before completion
2014-10-01 22:37:53,779 WARN Task Task[LSM.publish(Application[CiYtlCsd].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[2] @ 1412203072795);[subscription-delivery-entity-CiYtlCsd[Application[CiYtlCsd]]]:TxQDVJnn] is being finalized before completion
2014-10-01 22:37:53,780 WARN Task Task[LSM.publish(Application[CiYtlCsd].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[3] @ 1412203072795);[subscription-delivery-entity-CiYtlCsd[Application[CiYtlCsd]]]:ijB1wgR2] is being finalized before completion
2014-10-01 22:37:53,786 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: service.state.expected (brooklyn.entity.basic.Lifecycle$Transition)=stopped @ 1412203072648 / Wed Oct 01 22:37:52 UTC 2014 @ 1412203072648);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:ie4760No] is being finalized before completion
2014-10-01 22:37:53,788 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=DynamicGroupImpl{id=JZVYqV0W} @ 1412203072648);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:foamI7Vd] is being finalized before completion
2014-10-01 22:37:53,788 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=DynamicGroupImpl{id=zzSbwU9Q} @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:JXFq2OJ3] is being finalized before completion
2014-10-01 22:37:53,788 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=BalanceableWorkerPoolImpl{id=huK1KMd8} @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:TDYj8gGO] is being finalized before completion
2014-10-01 22:37:53,789 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockContainer[A] @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:tMydpjBM] is being finalized before completion
2014-10-01 22:37:53,789 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockContainer[B] @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:kkgTJK6e] is being finalized before completion
2014-10-01 22:37:53,789 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[1] @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:fhLGrfSy] is being finalized before completion
2014-10-01 22:37:53,789 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[2] @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:HmjHEFse] is being finalized before completion
2014-10-01 22:37:53,789 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[3] @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:EsRFKoUi] is being finalized before completion
2014-10-01 22:37:53,791 WARN Task Task[LSM.publish(Application[KikHEdpL].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[4] @ 1412203072651);[subscription-delivery-entity-KikHEdpL[Application[KikHEdpL]]]:WUiTMWeE] is being finalized before completion
2014-10-01 22:37:53,793 WARN Task Task[LSM.publish(Application[vPuI0fBQ].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockContainer[B] @ 1412203072362);[subscription-delivery-entity-vPuI0fBQ[Application[vPuI0fBQ]]]:KxWhjsrl] is being finalized before completion
2014-10-01 22:37:53,793 WARN Task Task[LSM.publish(Application[vPuI0fBQ].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[1] @ 1412203072362);[subscription-delivery-entity-vPuI0fBQ[Application[vPuI0fBQ]]]:J03UpEom] is being finalized before completion
2014-10-01 22:37:53,793 WARN Task Task[LSM.publish(Application[vPuI0fBQ].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[2] @ 1412203072362);[subscription-delivery-entity-vPuI0fBQ[Application[vPuI0fBQ]]]:x3lBxglT] is being finalized before completion
2014-10-01 22:37:53,795 WARN Task Task[LSM.publish(Application[lXEtTek4].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockContainer[A] @ 1412203072081);[subscription-delivery-entity-lXEtTek4[Application[lXEtTek4]]]:j4mN2Qvi] is being finalized before completion
2014-10-01 22:37:53,795 WARN Task Task[LSM.publish(Application[lXEtTek4].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockContainer[B] @ 1412203072081);[subscription-delivery-entity-lXEtTek4[Application[lXEtTek4]]]:LXtxbixQ] is being finalized before completion
2014-10-01 22:37:53,795 WARN Task Task[LSM.publish(Application[lXEtTek4].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[1] @ 1412203072082);[subscription-delivery-entity-lXEtTek4[Application[lXEtTek4]]]:IxM6JVsY] is being finalized before completion
2014-10-01 22:37:53,795 WARN Task Task[LSM.publish(Application[lXEtTek4].Sensor: entity.children.removed (brooklyn.entity.Entity)=MockItem[2] @ 1412203072082);[subscription-delivery-entity-lXEtTek4[Application[lXEtTek4]]]:AVmCIvoC] is being finalized before completion
2014-10-01 22:37:53,821 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.LoadBalancingPolicySoakTest.testLoadBalancingManyItemsQuickTest() finished in 605 ms
2014-10-01 22:37:53,821 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.after()
2014-10-01 22:37:53,857 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.after() finished in 36 ms
2014-10-01 22:37:53,857 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.before()
2014-10-01 22:37:53,907 WARN Deprecated use of unmanaged location (SimulatedLocation{id=ZGanVxBS, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:53,917 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.before() finished in 60 ms
2014-10-01 22:37:53,917 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.LoadBalancingPolicySoakTest.testLoadBalancingQuickTest()
2014-10-01 22:37:53,945 INFO brooklyn.policy.loadbalancing.LoadBalancingPolicy$2@b59a10 emitted COLD (suggesting 0): {pool.current.size=1, pool.current.workrate=0.0, pool.low.threshold=200.0, pool.high.threshold=300.0}
2014-10-01 22:37:54,062 INFO brooklyn.policy.loadbalancing.LoadBalancingPolicy$2@183422d emitted COLD (suggesting 1): {pool.current.size=5, pool.current.workrate=5.0, pool.low.threshold=1000.0, pool.high.threshold=1500.0}
2014-10-01 22:37:54,116 INFO LoadBalancingPolicySoakTest: cycle 1
2014-10-01 22:37:54,143 WARN Error invoking move at MockItem[item-5.1.1]: Container lock MockContainer[container-1]; it is not running
2014-10-01 22:37:54,146 ERROR Error rebalancing
brooklyn.util.exceptions.PropagatedRuntimeException: Error invoking move at MockItem[item-5.1.1]
at brooklyn.management.internal.EffectorUtils.handleEffectorException(EffectorUtils.java:251) ~[brooklyn-core-0.7.0-SNAPSHOT.jar:0.7.0-SNAPSHOT]
Caused by: java.util.concurrent.ExecutionException: java.util.concurrent.ExecutionException: java.lang.reflect.UndeclaredThrowableException
at brooklyn.management.internal.AbstractManagementContext.invokeEffectorMethodSync(AbstractManagementContext.java:282) ~[brooklyn-core-0.7.0-SNAPSHOT.jar:0.7.0-SNAPSHOT]
Caused by: java.util.concurrent.ExecutionException: java.lang.reflect.UndeclaredThrowableException
at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) [na:1.6.0_45]
Caused by: java.lang.reflect.UndeclaredThrowableException: null
at com.sun.proxy.$Proxy1391.lock(Unknown Source) ~[na:na]
Caused by: java.lang.reflect.InvocationTargetException: null
at sun.reflect.GeneratedMethodAccessor27.invoke(Unknown Source) ~[na:na]
Caused by: java.lang.IllegalStateException: Container lock MockContainer[container-1]; it is not running
at brooklyn.policy.loadbalancing.MockContainerEntityImpl.lock(MockContainerEntityImpl.java:68) ~[test-classes/:na]
2014-10-01 22:37:54,153 INFO brooklyn.policy.loadbalancing.LoadBalancingPolicy$2@1225446 emitted HOT (suggesting 5): {pool.current.size=4, pool.current.workrate=1424.0, pool.low.threshold=800.0, pool.high.threshold=1200.0}
2014-10-01 22:37:54,184 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.LoadBalancingPolicySoakTest.testLoadBalancingQuickTest() finished in 267 ms
2014-10-01 22:37:54,184 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.after()
2014-10-01 22:37:54,214 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.after() finished in 30 ms
2014-10-01 22:37:54,214 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp()
2014-10-01 22:37:54,613 WARN Deprecated use of unmanaged location (SimulatedLocation{id=gpvuxjZP, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:54,625 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp() finished in 410 ms
2014-10-01 22:37:54,625 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testContainerRemovedWillRemoveItsItems()
2014-10-01 22:37:54,684 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testContainerRemovedWillRemoveItsItems() finished in 59 ms
2014-10-01 22:37:54,684 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown()
2014-10-01 22:37:54,709 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown() finished in 25 ms
2014-10-01 22:37:54,709 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp()
[GC 292300K->63082K(769280K), 0.0365660 secs]
2014-10-01 22:37:55,120 WARN Deprecated use of unmanaged location (SimulatedLocation{id=U3LXwPhK, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:55,142 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp() finished in 433 ms
2014-10-01 22:37:55,142 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testFilterIsAppliedToItems()
2014-10-01 22:37:55,256 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testFilterIsAppliedToItems() finished in 114 ms
2014-10-01 22:37:55,257 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown()
2014-10-01 22:37:55,320 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown() finished in 64 ms
2014-10-01 22:37:55,321 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp()
2014-10-01 22:37:55,804 WARN Deprecated use of unmanaged location (SimulatedLocation{id=t82jcw3D, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:55,821 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp() finished in 500 ms
2014-10-01 22:37:55,821 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemMovedInIsAdded()
2014-10-01 22:37:55,895 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemMovedInIsAdded() finished in 74 ms
2014-10-01 22:37:55,895 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown()
2014-10-01 22:37:55,956 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown() finished in 61 ms
2014-10-01 22:37:55,956 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp()
[GC 290218K->61058K(768576K), 0.0208990 secs]
2014-10-01 22:37:56,409 WARN Deprecated use of unmanaged location (SimulatedLocation{id=Hu1LXK5P, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:56,412 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp() finished in 456 ms
2014-10-01 22:37:56,412 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemMovedOutIsRemoved()
2014-10-01 22:37:56,488 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemMovedOutIsRemoved() finished in 76 ms
2014-10-01 22:37:56,488 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown()
2014-10-01 22:37:56,517 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown() finished in 29 ms
2014-10-01 22:37:56,517 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp()
2014-10-01 22:37:56,823 WARN Deprecated use of unmanaged location (SimulatedLocation{id=o9gHcN4D, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:56,834 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp() finished in 317 ms
2014-10-01 22:37:56,834 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemUnmanagedIsRemoved()
2014-10-01 22:37:56,892 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemUnmanagedIsRemoved() finished in 58 ms
2014-10-01 22:37:56,892 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown()
2014-10-01 22:37:56,919 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown() finished in 27 ms
2014-10-01 22:37:56,920 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp()
[GC 288194K->61418K(769536K), 0.0432900 secs]
2014-10-01 22:37:57,257 WARN Deprecated use of unmanaged location (SimulatedLocation{id=FaYx01Uo, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:57,259 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp() finished in 339 ms
2014-10-01 22:37:57,259 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemsInOtherContainersIgnored()
2014-10-01 22:37:57,283 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testItemsInOtherContainersIgnored() finished in 24 ms
2014-10-01 22:37:57,283 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown()
2014-10-01 22:37:57,298 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown() finished in 15 ms
2014-10-01 22:37:57,299 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp()
2014-10-01 22:37:57,553 WARN Deprecated use of unmanaged location (SimulatedLocation{id=Vn4BjcO6, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:57,556 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.setUp() finished in 256 ms
2014-10-01 22:37:57,556 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testSimpleMembership()
2014-10-01 22:37:57,592 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.testSimpleMembership() finished in 35 ms
2014-10-01 22:37:57,592 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown()
2014-10-01 22:37:57,607 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.ItemsInContainersGroupTest.tearDown() finished in 15 ms
2014-10-01 22:37:57,607 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.before()
[GC 289578K->62581K(769344K), 0.0077610 secs]
2014-10-01 22:37:57,874 WARN Deprecated use of unmanaged location (SimulatedLocation{id=QhHCqulh, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:57,876 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.before() finished in 269 ms
2014-10-01 22:37:57,876 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.testCustomResizableCalledWhenResizing()
2014-10-01 22:37:57,897 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.testCustomResizableCalledWhenResizing() finished in 21 ms
2014-10-01 22:37:57,897 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.after()
2014-10-01 22:37:57,910 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.after() finished in 13 ms
2014-10-01 22:37:57,911 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.before()
2014-10-01 22:37:58,185 WARN Deprecated use of unmanaged location (SimulatedLocation{id=EDD83nZa, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:58,187 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.before() finished in 277 ms
2014-10-01 22:37:58,187 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.testDefaultResizeCallsResizeOnContainerGroup()
2014-10-01 22:37:58,214 WARN brooklyn.management.internal.LocalEntityManager@1e3b5cb redundant call to start management of entity (and descendants of) BalanceableWorkerPoolImpl{id=Nj4qnD0r}; skipping
java.lang.Exception: source of duplicate management of BalanceableWorkerPoolImpl{id=Nj4qnD0r}
at brooklyn.management.internal.LocalEntityManager.manage(LocalEntityManager.java:258) ~[brooklyn-core-0.7.0-SNAPSHOT.jar:0.7.0-SNAPSHOT]
2014-10-01 22:37:58,215 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.testDefaultResizeCallsResizeOnContainerGroup() finished in 28 ms
2014-10-01 22:37:58,215 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.after()
2014-10-01 22:37:58,232 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.after() finished in 17 ms
2014-10-01 22:37:58,232 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.before()
[GC 290741K->62175K(770176K), 0.0074580 secs]
2014-10-01 22:37:58,495 WARN Deprecated use of unmanaged location (SimulatedLocation{id=onTVDiST, name=loc}); will be managed automatically now but not supported in future versions
2014-10-01 22:37:58,497 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @BeforeMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.before() finished in 265 ms
2014-10-01 22:37:58,497 INFO TESTNG INVOKING: "Surefire test" - brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.testDefaultResizeFailsIfContainerGroupNotResizable()
2014-10-01 22:37:58,499 WARN Error invoking resize at BalanceableWorkerPoolImpl{id=tfig2nKW}: java.lang.UnsupportedOperationException: Container group is not resizable, and no resizable supplied: DynamicGroupImpl{id=s3s0AeYy} of type com.sun.proxy.$Proxy1455
2014-10-01 22:37:58,499 INFO TESTNG PASSED: "Surefire test" - brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.testDefaultResizeFailsIfContainerGroupNotResizable() finished in 2 ms
2014-10-01 22:37:58,499 INFO TESTNG INVOKING CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.after()
2014-10-01 22:37:58,511 INFO TESTNG PASSED CONFIGURATION: "Surefire test" - @AfterMethod brooklyn.policy.loadbalancing.BalanceableWorkerPoolTest.after() finished in 12 ms
2014-10-01 22:37:58,551 INFO TESTNG
===============================================
Surefire test
Tests run: 240, Failures: 2, Skips: 0
===============================================
Tests run: 240, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 57.446 sec <<< FAILURE! - in TestSuite
testSetsOnFireWhenFailToReplaceMemberManyTimes(brooklyn.policy.ha.ServiceReplacerTest) Time elapsed: 0.059 sec <<< FAILURE!
java.lang.AssertionError: expected [2] but found [1]
at org.testng.Assert.fail(Assert.java:94)
at org.testng.Assert.failNotEquals(Assert.java:494)
at org.testng.Assert.assertEquals(Assert.java:123)
at org.testng.Assert.assertEquals(Assert.java:370)
at org.testng.Assert.assertEquals(Assert.java:380)
at brooklyn.policy.ha.ServiceReplacerTest.testSetsOnFireWhenFailToReplaceMember(ServiceReplacerTest.java:156)
at brooklyn.policy.ha.ServiceReplacerTest.testSetsOnFireWhenFailToReplaceMemberManyTimes(ServiceReplacerTest.java:124)
testSetsOnFireWhenFailToReplaceMemberManyTimes(brooklyn.policy.ha.ServiceReplacerTest) Time elapsed: 0.053 sec <<< FAILURE!
java.lang.AssertionError: expected [2] but found [1]
at org.testng.Assert.fail(Assert.java:94)
at org.testng.Assert.failNotEquals(Assert.java:494)
at org.testng.Assert.assertEquals(Assert.java:123)
at org.testng.Assert.assertEquals(Assert.java:370)
at org.testng.Assert.assertEquals(Assert.java:380)
at brooklyn.policy.ha.ServiceReplacerTest.testSetsOnFireWhenFailToReplaceMember(ServiceReplacerTest.java:156)
at brooklyn.policy.ha.ServiceReplacerTest.testSetsOnFireWhenFailToReplaceMemberManyTimes(ServiceReplacerTest.java:124)
Results :
Failed tests:
ServiceReplacerTest.testSetsOnFireWhenFailToReplaceMemberManyTimes:124->testSetsOnFireWhenFailToReplaceMember:156 expected [2] but found [1]
ServiceReplacerTest.testSetsOnFireWhenFailToReplaceMemberManyTimes:124->testSetsOnFireWhenFailToReplaceMember:156 expected [2] but found [1]
Tests run: 240, Failures: 2, Errors: 0, Skipped: 0
[JENKINS] Recording test results
[JENKINS] Archiving disabled
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Brooklyn Core ..................................... SUCCESS [4:14.820s]
[INFO] Brooklyn Policies ................................. FAILURE [1:11.494s]
[INFO] Brooklyn Hazelcast Storage ........................ SKIPPED
[INFO] Brooklyn Jclouds Location Targets ................. SKIPPED
[INFO] Brooklyn Secure JMXMP Agent ....................... SKIPPED
[INFO] Brooklyn Software Base ............................ SKIPPED
[INFO] Brooklyn Network Software Entities ................ SKIPPED
[INFO] Brooklyn OSGi Software Entities ................... SKIPPED
[INFO] Brooklyn Web App Software Entities ................ SKIPPED
[INFO] Brooklyn Messaging Software Entities .............. SKIPPED
[INFO] Brooklyn Database Software Entities ............... SKIPPED
[INFO] Brooklyn NoSQL Data Store Software Entities ....... SKIPPED
[INFO] Brooklyn Monitoring Software Entities ............. SKIPPED
[INFO] Brooklyn CAMP REST API ............................ SKIPPED
[INFO] Brooklyn REST Server .............................. SKIPPED
[INFO] Brooklyn REST Client .............................. SKIPPED
[INFO] Brooklyn REST JavaScript Web GUI .................. SKIPPED
[INFO] Brooklyn Launcher ................................. SKIPPED
[INFO] Brooklyn Command Line Interface ................... SKIPPED
[INFO] Brooklyn All Things ............................... SKIPPED
[INFO] Brooklyn Distribution ............................. SKIPPED
[INFO] Brooklyn Simple Web Cluster Example ............... SKIPPED
[INFO] Brooklyn Global Web Fabric Example ................ SKIPPED
[INFO] Brooklyn Simple Messaging Publish-Subscribe Example SKIPPED
[INFO] Brooklyn NoSQL Cluster Examples ................... SKIPPED
[INFO] Brooklyn QA ....................................... SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 5:40.617s
[INFO] Finished at: Wed Oct 01 22:38:01 UTC 2014
[INFO] Final Memory: 28M/134M
[INFO] ------------------------------------------------------------------------
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
Waiting for Jenkins to finish collecting data
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.17:test (default-test) on project brooklyn-policy: There are test failures.
[ERROR]
[ERROR] Please refer to <https://builds.apache.org/job/incubator-brooklyn-pull-requests/ws/policy/target/surefire-reports> for the individual test results.
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :brooklyn-policy
channel stopped
Build failed in Jenkins: incubator-brooklyn-pull-requests #5
Posted by Apache Jenkins Server <je...@builds.apache.org>.
See <https://builds.apache.org/job/incubator-brooklyn-pull-requests/5/>
------------------------------------------
GitHub pull request #165 to apache/incubator-brooklyn
Building remotely on ubuntu-4 (Ubuntu ubuntu4 ubuntu) in workspace <https://builds.apache.org/job/incubator-brooklyn-pull-requests/ws/>
> git rev-parse --is-inside-work-tree
Fetching changes from the remote Git repository
> git config remote.origin.url git://github.com/apache/incubator-brooklyn.git
Fetching upstream changes from git://github.com/apache/incubator-brooklyn.git
> git --version
> git fetch --tags --progress git://github.com/apache/incubator-brooklyn.git +refs/heads/*:refs/remotes/origin/*
> git config core.sparsecheckout
> git checkout -f origin/master
> git branch -a
> git rev-parse master^{commit}
> git rev-parse remotes/origin/0.4^{commit}
> git rev-parse remotes/origin/0.4.0^{commit}
> git rev-parse remotes/origin/0.4.0-M1^{commit}
> git rev-parse remotes/origin/0.4.0-M2^{commit}
> git rev-parse remotes/origin/0.4.0-rc.1^{commit}
> git rev-parse remotes/origin/0.4.0-rc.2^{commit}
> git rev-parse remotes/origin/0.5^{commit}
> git rev-parse remotes/origin/0.5.0^{commit}
> git rev-parse remotes/origin/0.5.0-M1^{commit}
> git rev-parse remotes/origin/0.5.0-M2^{commit}
> git rev-parse remotes/origin/0.5.0-rc.1^{commit}
> git rev-parse remotes/origin/0.5.0-rc.2^{commit}
> git rev-parse remotes/origin/0.6.0^{commit}
> git rev-parse remotes/origin/0.6.0-M1^{commit}
> git rev-parse remotes/origin/0.6.0-M2^{commit}
> git rev-parse remotes/origin/0.6.0-rc.1^{commit}
> git rev-parse remotes/origin/0.6.0-rc.2^{commit}
> git rev-parse remotes/origin/0.6.0-rc.3^{commit}
> git rev-parse remotes/origin/0.6.0-rc.4^{commit}
> git rev-parse remotes/origin/0.6.x^{commit}
> git rev-parse remotes/origin/0.7.0-M1^{commit}
> git rev-parse remotes/origin/0.7.0-M1-amp-2.0.0-M1^{commit}
> git rev-parse remotes/origin/feature/policy-persistence^{commit}
> git rev-parse remotes/origin/feature/storage2^{commit}
> git rev-parse remotes/origin/master^{commit}
> git branch -D master
> git checkout -b master origin/master
Opening connection
Done: 0
Counting objects
Done: 12
Finding sources
Done: 12
Getting sizes
Done: 11
Compressing objects
Done: 27990
Writing objects
Done: 12
remote: Updating references
Merging refs/tags/changes/5
> git rev-parse refs/tags/changes/5^{commit}
> git merge 2a9ce5bc2dc632ad556d28eefb38335607b7d438
FATAL: Could not merge AnyObjectId[2a9ce5bc2dc632ad556d28eefb38335607b7d438]
hudson.plugins.git.GitException: Could not merge AnyObjectId[2a9ce5bc2dc632ad556d28eefb38335607b7d438]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:446)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:76)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:87)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:299)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
Caused by: hudson.plugins.git.GitException: Command "git merge 2a9ce5bc2dc632ad556d28eefb38335607b7d438" returned status code 1:
stdout: Auto-merging core/src/main/java/brooklyn/util/file/ArchiveUtils.java
CONFLICT (content): Merge conflict in core/src/main/java/brooklyn/util/file/ArchiveUtils.java
Auto-merging core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1301)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1277)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1273)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1078)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1088)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:444)
... 17 more