See <https://builds.apache.org/job/openmeetings-pr-build/57/display/redirect>

Changes:


------------------------------------------
GitHub pull request #87 to apache/openmeetings
Running as SYSTEM
[EnvInject] - Loading node environment variables.
Building remotely on H36 (ubuntu) in workspace 
<https://builds.apache.org/job/openmeetings-pr-build/ws/>
[WS-CLEANUP] Deleting project workspace...
[WS-CLEANUP] Deferred wipeout is used...
[WS-CLEANUP] Done
No credentials specified
Cloning the remote Git repository
Cloning repository https://github.com/apache/openmeetings.git
 > git init <https://builds.apache.org/job/openmeetings-pr-build/ws/> # 
 > timeout=10
Fetching upstream changes from https://github.com/apache/openmeetings.git
 > git --version # timeout=10
 > git fetch --tags --progress -- https://github.com/apache/openmeetings.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url https://github.com/apache/openmeetings.git # 
 > timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
 > timeout=10
 > git config remote.origin.url https://github.com/apache/openmeetings.git # 
 > timeout=10
Pruning obsolete local branches
Fetching upstream changes from https://github.com/apache/openmeetings.git
 > git fetch --tags --progress --prune -- 
 > https://github.com/apache/openmeetings.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master
 > git branch -a -v --no-abbrev # timeout=10
 > git checkout -b master origin/master
  Opening connection
    Done: 0
  Counting objects
    Done: 0
  Finding sources
    Done: 0
  Writing objects
    Done: 0
  remote: Updating references
Merging refs/tags/changes/57
 > git rev-parse refs/tags/changes/57^{commit} # timeout=10
 > git merge e4f034aaf7917162c3d20227508a5912cee35adc # timeout=10
FATAL: Command "git merge e4f034aaf7917162c3d20227508a5912cee35adc" returned 
status code 1:
stdout: Auto-merging openmeetings-web/src/main/webapp/css/raw-room.css
CONFLICT (content): Merge conflict in 
openmeetings-web/src/main/webapp/css/raw-room.css
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to H36
                at 
hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1743)
                at 
hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357)
                at hudson.remoting.Channel.call(Channel.java:957)
                at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283)
                at com.sun.proxy.$Proxy122.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:1086)
                at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1193)
                at hudson.scm.SCM.checkout(SCM.java:504)
                at 
hudson.model.AbstractProject.checkout(AbstractProject.java:1208)
                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:1815)
                at 
hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:543)
                at 
hudson.model.ResourceController.execute(ResourceController.java:97)
                at hudson.model.Executor.run(Executor.java:429)
hudson.plugins.git.GitException: Command "git merge 
e4f034aaf7917162c3d20227508a5912cee35adc" returned status code 1:
stdout: Auto-merging openmeetings-web/src/main/webapp/css/raw-room.css
CONFLICT (content): Merge conflict in 
openmeetings-web/src/main/webapp/css/raw-room.css
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2172)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2140)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2136)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1741)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:841)
        at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:78)
        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:929)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855)
        at hudson.remoting.UserRequest.perform(UserRequest.java:212)
        at hudson.remoting.UserRequest.perform(UserRequest.java:54)
        at hudson.remoting.Request$2.run(Request.java:369)
        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:1149)
        at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
        at java.lang.Thread.run(Thread.java:748)
Archiving artifacts
Putting comment on the pull request

Reply via email to