See 
<https://ci-builds.apache.org/job/Tomee/job/master-pull-request/32/display/redirect>

Changes:


------------------------------------------
GitHub pull request #922 to apache/tomee
Running as SYSTEM
[EnvInject] - Loading node environment variables.
Building remotely on builds40 (ubuntu) in workspace 
<https://ci-builds.apache.org/job/Tomee/job/master-pull-request/ws/>
The recommended git tool is: NONE
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/apache/tomee
 > git init 
 > <https://ci-builds.apache.org/job/Tomee/job/master-pull-request/ws/> # 
 > timeout=10
Fetching upstream changes from https://github.com/apache/tomee
 > git --version # timeout=10
 > git --version # 'git version 2.17.1'
 > git fetch --tags --progress -- https://github.com/apache/tomee 
 > +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/apache/tomee # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
 > timeout=10
Avoid second fetch
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/main # timeout=10
 > git branch -a -v --no-abbrev # timeout=10
 > git checkout -b main origin/main # timeout=10
  Opening connection
    Done: 0
  Counting objects
    Done: 0
  Finding sources
    Done: 0
  Writing objects
    Done: 0
  remote: Updating references
Merging refs/tags/changes/32
 > git rev-parse refs/tags/changes/32^{commit} # timeout=10
 > git remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge ba1d7ce65083503bf7e600d8158bab8c0278c51f # timeout=10
FATAL: Command "git merge ba1d7ce65083503bf7e600d8158bab8c0278c51f" returned 
status code 1:
stdout: Auto-merging tomee/tomee-microprofile/mp-common/pom.xml
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging boms/tomee-plus/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plus/pom.xml
Auto-merging boms/tomee-plume/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plume/pom.xml
Auto-merging boms/tomee-microprofile/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-microprofile/pom.xml
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to builds40
                at 
hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1784)
                at 
hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:356)
                at hudson.remoting.Channel.call(Channel.java:1000)
                at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:285)
                at com.sun.proxy.$Proxy156.merge(Unknown Source)
                at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:455)
                at 
com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:106)
                at 
hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1151)
                at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1308)
                at hudson.scm.SCM.checkout(SCM.java:540)
                at 
hudson.model.AbstractProject.checkout(AbstractProject.java:1215)
                at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:645)
                at 
jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:85)
                at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:517)
                at hudson.model.Run.execute(Run.java:1896)
                at 
hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:543)
                at 
hudson.model.ResourceController.execute(ResourceController.java:101)
                at hudson.model.Executor.run(Executor.java:442)
hudson.plugins.git.GitException: Command "git merge 
ba1d7ce65083503bf7e600d8158bab8c0278c51f" returned status code 1:
stdout: Auto-merging tomee/tomee-microprofile/mp-common/pom.xml
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging boms/tomee-plus/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plus/pom.xml
Auto-merging boms/tomee-plume/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plume/pom.xml
Auto-merging boms/tomee-microprofile/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-microprofile/pom.xml
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2671)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2096)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1996)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1987)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$600(CliGitAPIImpl.java:84)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:955)
        at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:88)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:84)
        at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
        at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
        at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
        at java.base/java.lang.reflect.Method.invoke(Method.java:566)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:924)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:902)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:853)
        at hudson.remoting.UserRequest.perform(UserRequest.java:211)
        at hudson.remoting.UserRequest.perform(UserRequest.java:54)
        at hudson.remoting.Request$2.run(Request.java:376)
        at 
hudson.remoting.InterceptingExecutorService.lambda$wrap$0(InterceptingExecutorService.java:78)
        at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
        at 
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
        at 
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
        at java.base/java.lang.Thread.run(Thread.java:834)
INFO: Processing JUnit
ERROR: Step ?Publish xUnit test result report? failed: [JUnit] - No test report 
file(s) were found with the pattern '**/target/surefire-reports/TEST-*.xml' 
relative to 
'<https://ci-builds.apache.org/job/Tomee/job/master-pull-request/ws/'> for the 
testing framework 'JUnit'.
Did you enter a pattern relative to (and within) the workspace directory?
Did you generate the result report(s) for 'JUnit'?"
Putting comment on the pull request

Reply via email to