Pull request #2035 updated
<span class='greyed'><small>12:29:31</small> Connecting to <a href='https://api.github.com'>https://api.github.com</a> using docker-jenkins/****** (docker-jenkins GitHub credentials)
</span>Loading trusted files from base branch master at 415fe22dbe27df534d77e9a01b5ad9f6f89e5e7c rather than 3ba8407b82f290d2de3e6d542199381e2fce3f2b
Obtained Jenkinsfile from 415fe22dbe27df534d77e9a01b5ad9f6f89e5e7c
Running in Durability level: PERFORMANCE_OPTIMIZED
Loading library jps@master
Examining <a href='https://github.com/docker/jps'>docker/jps</a>
Attempting to resolve master as a branch
Resolved master as branch master at revision 5d8b74fd03a1c7cc00e1c1f32d100ed97a17f4f0
using credential jps-reader
 &gt; git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 &gt; git config remote.origin.url <a href='https://github.com/docker/jps.git'>https://github.com/docker/jps.git</a> # timeout=10
Fetching without tags
Fetching upstream changes from <a href='https://github.com/docker/jps.git'>https://github.com/docker/jps.git</a>
 &gt; git --version # timeout=10
using GIT_ASKPASS to set credentials GitHub credentials for docker/jps
 &gt; git fetch --no-tags --force --progress -- <a href='https://github.com/docker/jps.git'>https://github.com/docker/jps.git</a> +refs/heads/master:refs/remotes/origin/master # timeout=10
Checking out Revision 5d8b74fd03a1c7cc00e1c1f32d100ed97a17f4f0 (master)
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f 5d8b74fd03a1c7cc00e1c1f32d100ed97a17f4f0 # timeout=10
Commit message: "Merge pull request #25 from ingshtrom/in-2733-load-from-file"
 &gt; git rev-list --no-walk 5d8b74fd03a1c7cc00e1c1f32d100ed97a17f4f0 # timeout=10
Excluding src/test/ from checkout of git <a href='https://github.com/docker/jps.git'>https://github.com/docker/jps.git</a> so that shared library test code cannot be accessed by Pipelines.
To remove this log message, move the test code outside of src/. To restore the previous behavior that allowed access to files in src/test/, pass -Dorg.jenkinsci.plugins.workflow.libs.SCMSourceRetriever.INCLUDE_SRC_TEST_IN_LIBRARIES=true to the java command used to start Jenkins.
<span class="pipeline-new-node" nodeId="2" startId="2">[Pipeline] Start of Pipeline
</span><span class="pipeline-new-node" nodeId="3" startId="3" enclosingId="2">[Pipeline] node
</span><span class="pipeline-node-3">Running on <a href='/public/computer/EC2%20(managed-agents)%20-%20ubuntu-1804-overlay2%20(i-0894195f5301b54c7)/' class='jenkins-table__link model-link model-link--float'>EC2 (managed-agents) - ubuntu-1804-overlay2 (i-0894195f5301b54c7)</a> in /home/ubuntu/workspace/cli_PR-2035
</span><span class="pipeline-new-node" nodeId="4" startId="4" enclosingId="3">[Pipeline] {
</span><span class="pipeline-new-node" nodeId="5" startId="5" enclosingId="4">[Pipeline] stage
</span><span class="pipeline-new-node" nodeId="6" startId="6" enclosingId="5" label="Declarative: Checkout SCM">[Pipeline] { (Declarative: Checkout SCM)
</span><span class="pipeline-new-node" nodeId="7" enclosingId="6">[Pipeline] checkout
</span><span class="pipeline-node-7">using credential docker-jenkins-github-credentials
Cloning the remote Git repository
Cloning with configured refspecs honoured and without tags
Cloning repository <a href='https://github.com/docker/cli.git'>https://github.com/docker/cli.git</a>
 &gt; git init /home/ubuntu/workspace/cli_PR-2035 # timeout=10
Fetching upstream changes from <a href='https://github.com/docker/cli.git'>https://github.com/docker/cli.git</a>
 &gt; git --version # timeout=10
using GIT_ASKPASS to set credentials docker-jenkins GitHub credentials
 &gt; git fetch --no-tags --progress -- <a href='https://github.com/docker/cli.git'>https://github.com/docker/cli.git</a> +refs/pull/2035/head:refs/remotes/origin/PR-2035 +refs/heads/master:refs/remotes/origin/master # timeout=10
Fetching without tags
Merging remotes/origin/master commit 415fe22dbe27df534d77e9a01b5ad9f6f89e5e7c into PR head commit 3ba8407b82f290d2de3e6d542199381e2fce3f2b
 &gt; git config remote.origin.url <a href='https://github.com/docker/cli.git'>https://github.com/docker/cli.git</a> # timeout=10
 &gt; git config --add remote.origin.fetch +refs/pull/2035/head:refs/remotes/origin/PR-2035 # timeout=10
 &gt; git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/docker/cli.git'>https://github.com/docker/cli.git</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/docker/cli.git'>https://github.com/docker/cli.git</a>
using GIT_ASKPASS to set credentials docker-jenkins GitHub credentials
 &gt; git fetch --no-tags --progress -- <a href='https://github.com/docker/cli.git'>https://github.com/docker/cli.git</a> +refs/pull/2035/head:refs/remotes/origin/PR-2035 +refs/heads/master:refs/remotes/origin/master # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f 3ba8407b82f290d2de3e6d542199381e2fce3f2b # timeout=10
 &gt; git merge 415fe22dbe27df534d77e9a01b5ad9f6f89e5e7c # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f 3ba8407b82f290d2de3e6d542199381e2fce3f2b # timeout=10
</span><span class="pipeline-new-node" nodeId="8" startId="6">[Pipeline] }
</span><span class="pipeline-new-node" nodeId="9" startId="5">[Pipeline] // stage
</span><span class="pipeline-new-node" nodeId="10" startId="4">[Pipeline] }
</span><span class="pipeline-new-node" nodeId="11" startId="3">[Pipeline] // node
</span><span class="pipeline-new-node" nodeId="12" startId="2">[Pipeline] End of Pipeline
</span>
GitHub has been notified of this commit’s build result

Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to EC2 (managed-agents) - ubuntu-1804-overlay2 (i-0894195f5301b54c7)
		at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1788)
		at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:356)
		at hudson.remoting.Channel.call(Channel.java:998)
		at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.execute(RemoteGitImpl.java:146)
		at sun.reflect.GeneratedMethodAccessor782.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.$Proxy479.execute(Unknown Source)
		at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:120)
		at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1063)
		at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1168)
		at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:125)
		at org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:93)
		at org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:80)
		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)
		at java.lang.Thread.run(Thread.java:748)
hudson.plugins.git.GitException: Command "git merge 415fe22dbe27df534d77e9a01b5ad9f6f89e5e7c" returned status code 1:
stdout: CONFLICT (rename/delete): vendor/github.com/mattn/go-shellwords/LICENSE deleted in 415fe22dbe27df534d77e9a01b5ad9f6f89e5e7c and renamed to vendor/github.com/mattn/go-runewidth/LICENSE in HEAD. Version HEAD of vendor/github.com/mattn/go-runewidth/LICENSE left in tree.
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2372)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2302)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2298)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1857)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:877)
	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:211)
	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:264)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
	at java.lang.Thread.run(Thread.java:834)
Finished: FAILURE