Pull request #2308 updated Connecting to https://api.github.com using sjoelund.se/****** (GitHub Access Token) Connecting to https://api.github.com to check permissions of obtain list of thorade for modelica/ModelicaSpecification Loading trusted files from base branch master at 2522393319abcf91c1c08320bc5b49c19ac09c1b rather than eb421707c0dbb246e55a79dee1ef8be8d8dbc756 Obtained .CI/Jenkinsfile from 2522393319abcf91c1c08320bc5b49c19ac09c1b Running in Durability level: MAX_SURVIVABILITY [Pipeline] Start of Pipeline [Pipeline] stage [Pipeline] { (build) [Pipeline] node Agent jenkins-5wrx9 is provisioned from template Kubernetes Pod Template Agent specification [Kubernetes Pod Template] (kubernetes linux linux-dpkg-32bit linux-2018): * [jnlp] docker.openmodelica.org/jnlp-slave:default(resourceRequestCpu: 4, resourceRequestMemory: 6Gi) Running on jenkins-5wrx9 in /home/jenkins/ws/on_ModelicaSpecification_PR-2308 [Pipeline] { [Pipeline] checkout using credential github Cloning the remote Git repository Cloning with configured refspecs honoured and without tags Cloning repository https://github.com/modelica/ModelicaSpecification.git > git init /home/jenkins/ws/on_ModelicaSpecification_PR-2308 # timeout=10 Fetching upstream changes from https://github.com/modelica/ModelicaSpecification.git > git --version # timeout=10 using GIT_ASKPASS to set credentials GitHub Access Token > git fetch --no-tags --progress https://github.com/modelica/ModelicaSpecification.git +refs/pull/2308/head:refs/remotes/origin/PR-2308 +refs/heads/master:refs/remotes/origin/master # timeout=10 Cleaning workspace Fetching without tags Merging remotes/origin/master commit 2522393319abcf91c1c08320bc5b49c19ac09c1b into PR head commit eb421707c0dbb246e55a79dee1ef8be8d8dbc756 > git config remote.origin.url https://github.com/modelica/ModelicaSpecification.git # timeout=10 > git config --add remote.origin.fetch +refs/pull/2308/head:refs/remotes/origin/PR-2308 # timeout=10 > git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master # timeout=10 > git config remote.origin.url https://github.com/modelica/ModelicaSpecification.git # timeout=10 > git rev-parse --verify HEAD # timeout=10 No valid HEAD. Skipping the resetting > git clean -fdx # timeout=10 Fetching upstream changes from https://github.com/modelica/ModelicaSpecification.git using GIT_ASKPASS to set credentials GitHub Access Token > git fetch --no-tags --progress https://github.com/modelica/ModelicaSpecification.git +refs/pull/2308/head:refs/remotes/origin/PR-2308 +refs/heads/master:refs/remotes/origin/master # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f eb421707c0dbb246e55a79dee1ef8be8d8dbc756 # timeout=10 > git merge 2522393319abcf91c1c08320bc5b49c19ac09c1b # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f eb421707c0dbb246e55a79dee1ef8be8d8dbc756 # timeout=10 [Pipeline] } [Pipeline] // node [Pipeline] } [Pipeline] // stage [Pipeline] stage [Pipeline] { (upload) Stage "upload" skipped due to earlier failure(s) [Pipeline] } [Pipeline] // stage [Pipeline] stage [Pipeline] { (index) Stage "index" skipped due to earlier failure(s) [Pipeline] } [Pipeline] // stage [Pipeline] End of Pipeline GitHub has been notified of this commit’s build result Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to JNLP4-connect connection from ripper2.maas/192.168.1.113:48926 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 org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.execute(RemoteGitImpl.java:146) at sun.reflect.GeneratedMethodAccessor334.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.invoke(RemoteGitImpl.java:132) at com.sun.proxy.$Proxy122.execute(Unknown Source) at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:122) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1083) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1176) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:120) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:90) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:77) at org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 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) hudson.plugins.git.GitException: Command "git merge 2522393319abcf91c1c08320bc5b49c19ac09c1b" returned status code 1: stdout: Auto-merging chapters/functions.tex CONFLICT (content): Merge conflict in chapters/functions.tex Removing .travis_texlive.profile Removing .travis_install.sh Removing .travis.yml Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2318) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2248) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2244) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1777) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:802) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:161) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:154) 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 hudson.remoting.Engine$1.lambda$newThread$0(Engine.java:93) at java.lang.Thread.run(Thread.java:748) Finished: FAILURE