Build: https://builds.apache.org/job/PreCommit-ZOOKEEPER-github-pr-build/1838/
###################################################################################
########################## LAST 60 LINES OF THE CONSOLE
###########################
[...truncated 3.15 KB...]
at hudson.remoting.Channel.call(Channel.java:908)
at
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:281)
at com.sun.proxy.$Proxy109.merge(Unknown Source)
at
org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:435)
at
com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
at
hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1054)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1161)
at hudson.scm.SCM.checkout(SCM.java:495)
at
hudson.model.AbstractProject.checkout(AbstractProject.java:1202)
at
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574)
at
jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499)
at hudson.model.Run.execute(Run.java:1724)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at
hudson.model.ResourceController.execute(ResourceController.java:97)
at hudson.model.Executor.run(Executor.java:429)
hudson.plugins.git.GitException: Command "git merge
25372c1eab62e5285bc87fc67e31176a23fbc1d6" returned status code 1:
stdout: Auto-merging src/java/test/org/apache/zookeeper/test/QuorumTest.java
CONFLICT (add/add): Merge conflict in
src/java/test/org/apache/zookeeper/test/QuorumTest.java
Auto-merging src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
CONFLICT (add/add): Merge conflict in
src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
Auto-merging src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
CONFLICT (add/add): Merge conflict in
src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
Auto-merging src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
CONFLICT (add/add): Merge conflict in
src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
Auto-merging
src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java
CONFLICT (add/add): Merge conflict in
src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:697)
at
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:72)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:922)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:896)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:853)
at hudson.remoting.UserRequest.perform(UserRequest.java:207)
at hudson.remoting.UserRequest.perform(UserRequest.java:53)
at hudson.remoting.Request$2.run(Request.java:358)
at
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:748)
Archiving artifacts
Recording test results
ERROR: Step ?Publish JUnit test result report? failed: No test report files
were found. Configuration error?
[description-setter] Could not determine description.
Putting comment on the pull request
Email was triggered for: Failure - Any
Sending email for trigger: Failure - Any
###################################################################################
############################## FAILED TESTS (if any)
##############################
No tests ran.
