Skip to content
Failed

Console Output

Branch indexing
19:58:11 Connecting to https://api.github.com using docker-jenkins/****** (docker-jenkins GitHub credentials)
Checking out git https://github.com/moby/moby.git into /var/jenkins_home/workspace/moby_PR-37704-AG6TN2DPKGFQIWMA7M4RLSAD7TOZME375OXC6FZMYG7ZHNM3R5ZA@script to read Jenkinsfile
using credential docker-jenkins-github-credentials
Cloning the remote Git repository
Cloning with configured refspecs honoured and without tags
Cloning repository https://github.com/moby/moby.git
 > git init /var/jenkins_home/workspace/moby_PR-37704-AG6TN2DPKGFQIWMA7M4RLSAD7TOZME375OXC6FZMYG7ZHNM3R5ZA@script # timeout=10
Fetching upstream changes from https://github.com/moby/moby.git
 > git --version # timeout=10
using GIT_ASKPASS to set credentials docker-jenkins GitHub credentials
 > git fetch --no-tags --progress https://github.com/moby/moby.git +refs/pull/37704/head:refs/remotes/origin/PR-37704 +refs/heads/master:refs/remotes/origin/master
 > git config remote.origin.url https://github.com/moby/moby.git # timeout=10
 > git config --add remote.origin.fetch +refs/pull/37704/head:refs/remotes/origin/PR-37704 # 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/moby/moby.git # timeout=10
Fetching without tags
Fetching upstream changes from https://github.com/moby/moby.git
using GIT_ASKPASS to set credentials docker-jenkins GitHub credentials
 > git fetch --no-tags --progress https://github.com/moby/moby.git +refs/pull/37704/head:refs/remotes/origin/PR-37704 +refs/heads/master:refs/remotes/origin/master
Merging remotes/origin/master commit 582591d56bf18355993078539e5464b4e4f630ed into PR head commit 1f6a2551678c37e3272232ed7279470599ad234c
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 1f6a2551678c37e3272232ed7279470599ad234c
 > git merge 582591d56bf18355993078539e5464b4e4f630ed # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 1f6a2551678c37e3272232ed7279470599ad234c

GitHub has been notified of this commit’s build result

hudson.plugins.git.GitException: Command "git merge 582591d56bf18355993078539e5464b4e4f630ed" returned status code 1:
stdout: Auto-merging vendor/google.golang.org/grpc/version.go
Removing vendor/google.golang.org/grpc/transport/go17.go
Removing vendor/google.golang.org/grpc/transport/go16.go
Removing vendor/google.golang.org/grpc/resolver/dns/go17.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/transport.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/log.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http_util.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_server.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_client.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/handler_server.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/flowcontrol.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/controlbuf.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/bdp_estimator.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/util_nonlinux.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/util_linux.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/types.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/funcs.go
Removing vendor/google.golang.org/grpc/health/health.go
Removing vendor/google.golang.org/grpc/health/grpc_health_v1/health.proto
Removing vendor/google.golang.org/grpc/grpclb_util.go
Removing vendor/google.golang.org/grpc/grpclb_remote_balancer.go
Removing vendor/google.golang.org/grpc/grpclb_picker.go
Removing vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.proto
Removing vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.pb.go
Removing vendor/google.golang.org/grpc/grpclb.go
Removing vendor/google.golang.org/grpc/go17.go
Removing vendor/google.golang.org/grpc/go16.go
Auto-merging vendor/google.golang.org/grpc/credentials/tls13.go
Auto-merging vendor/google.golang.org/grpc/credentials/internal/syscallconn_appengine.go
Removing vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
Removing vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
Removing vendor/golang.org/x/sys/unix/openbsd_pledge.go
Removing vendor/golang.org/x/net/trace/trace_go17.go
Removing vendor/golang.org/x/net/trace/trace_go16.go
Removing vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go
Removing vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go
Removing vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go
Removing vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go
Removing vendor/golang.org/x/net/ipv4/packet_go1_9.go
Removing vendor/golang.org/x/net/ipv4/packet_go1_8.go
Removing vendor/golang.org/x/net/internal/socket/reflect.go
Removing vendor/golang.org/x/net/internal/socket/rawconn_stub.go
Auto-merging vendor/golang.org/x/net/idna/tables10.0.0.go
Auto-merging vendor/golang.org/x/net/idna/idna10.0.0.go
Removing vendor/golang.org/x/net/http2/not_go19.go
Removing vendor/golang.org/x/net/http2/not_go18.go
Removing vendor/golang.org/x/net/http2/not_go17.go
Removing vendor/golang.org/x/net/http2/not_go16.go
Removing vendor/golang.org/x/net/http2/go19.go
Removing vendor/golang.org/x/net/http2/go18.go
Removing vendor/golang.org/x/net/http2/go17_not18.go
Removing vendor/golang.org/x/net/http2/go17.go
Removing vendor/golang.org/x/net/http2/go16.go
Removing vendor/golang.org/x/net/http2/configure_transport.go
Removing vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go
Removing vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
Removing vendor/golang.org/x/crypto/ssh/terminal/util_solaris.go
Removing vendor/golang.org/x/crypto/ssh/terminal/util_plan9.go
Removing vendor/golang.org/x/crypto/ssh/terminal/util_linux.go
Removing vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go
Removing vendor/golang.org/x/crypto/ssh/terminal/util.go
Removing vendor/golang.org/x/crypto/ssh/terminal/terminal.go
Auto-merging vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.s
Auto-merging vendor/golang.org/x/crypto/poly1305/sum_generic.go
Auto-merging vendor/go.etcd.io/bbolt/tx.go
Auto-merging vendor/go.etcd.io/bbolt/page.go
Auto-merging vendor/go.etcd.io/bbolt/node.go
Auto-merging vendor/go.etcd.io/bbolt/errors.go
Auto-merging vendor/go.etcd.io/bbolt/doc.go
Auto-merging vendor/go.etcd.io/bbolt/db.go
Auto-merging vendor/go.etcd.io/bbolt/cursor.go
Auto-merging vendor/go.etcd.io/bbolt/bucket.go
Auto-merging vendor/go.etcd.io/bbolt/boltsync_unix.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_windows.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_unix_solaris.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_unix.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_s390x.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_ppc64le.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_ppc.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_openbsd.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_linux.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_arm64.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_arm.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_amd64.go
Auto-merging vendor/go.etcd.io/bbolt/bolt_386.go
Auto-merging vendor/go.etcd.io/bbolt/README.md
Removing vendor/github.com/vishvananda/netns/netns_linux_s390x.go
Removing vendor/github.com/vishvananda/netns/netns_linux_ppc64le.go
Removing vendor/github.com/vishvananda/netns/netns_linux_arm64.go
Removing vendor/github.com/vishvananda/netns/netns_linux_arm.go
Removing vendor/github.com/vishvananda/netns/netns_linux_amd64.go
Removing vendor/github.com/vishvananda/netns/netns_linux_386.go
Removing vendor/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go
Removing vendor/github.com/vbatts/tar-split/archive/tar/stat_atim.go
Auto-merging vendor/github.com/vbatts/tar-split/archive/tar/format.go
Removing vendor/github.com/ugorji/go/codec/time.go
Removing vendor/github.com/ugorji/go/codec/prebuild.go
Removing vendor/github.com/ugorji/go/codec/noop.go
Removing vendor/github.com/tonistiigi/fsutil/walker_windows.go
Auto-merging vendor/github.com/tonistiigi/fsutil/types/wire.proto
Auto-merging vendor/github.com/tonistiigi/fsutil/types/wire.pb.go
Auto-merging vendor/github.com/tonistiigi/fsutil/types/stat.proto
Auto-merging vendor/github.com/tonistiigi/fsutil/types/stat.pb.go
Auto-merging vendor/github.com/tonistiigi/fsutil/types/generate.go
Auto-merging vendor/github.com/tonistiigi/fsutil/stat_unix.go
Auto-merging vendor/github.com/tinylib/msgp/msgp/purego.go
Removing vendor/github.com/sirupsen/logrus/terminal_linux.go
Removing vendor/github.com/sirupsen/logrus/terminal_bsd.go
Removing vendor/github.com/prometheus/client_golang/prometheus/push.go
Auto-merging vendor/github.com/prometheus/client_golang/prometheus/expvar_collector.go
Removing vendor/github.com/pivotal-golang/clock/README.md
Removing vendor/github.com/pborman/uuid/uuid.go
Removing vendor/github.com/pborman/uuid/json.go
Removing vendor/github.com/pborman/uuid/doc.go
Removing vendor/github.com/pborman/uuid/README.md
Auto-merging vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
Removing vendor/github.com/moby/buildkit/vendor.conf
Auto-merging vendor/github.com/moby/buildkit/solver/bboltcachestorage/storage.go
Removing vendor/github.com/moby/buildkit/cache/gc.go
Removing vendor/github.com/moby/buildkit/cache/fsutil.go
Removing vendor/github.com/gorilla/context/doc.go
Removing vendor/github.com/gorilla/context/context.go
Removing vendor/github.com/gorilla/context/README.md
Removing vendor/github.com/gorilla/context/LICENSE
Auto-merging vendor/github.com/google/uuid/version4.go
Auto-merging vendor/github.com/google/uuid/version1.go
Auto-merging vendor/github.com/google/uuid/util.go
Auto-merging vendor/github.com/google/uuid/time.go
Auto-merging vendor/github.com/google/uuid/sql.go
Auto-merging vendor/github.com/google/uuid/node.go
Auto-merging vendor/github.com/google/uuid/hash.go
Auto-merging vendor/github.com/google/uuid/dce.go
Removing vendor/github.com/gogo/protobuf/proto/decode_gogo.go
Auto-merging vendor/github.com/gogo/googleapis/LICENSE
Removing vendor/github.com/docker/libnetwork/drivers_experimental_linux.go
Auto-merging vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_rawsockaddr_data_uint8.go
Auto-merging vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_rawsockaddr_data_int8.go
Removing vendor/github.com/coreos/etcd/wal/wal_windows.go
Removing vendor/github.com/coreos/etcd/wal/wal_unix.go
Removing vendor/github.com/containerd/continuity/sysx/xattr_solaris.go
Removing vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go
Removing vendor/github.com/containerd/continuity/sysx/xattr_linux.go
Removing vendor/github.com/containerd/continuity/sysx/xattr_freebsd.go
Removing vendor/github.com/containerd/continuity/sysx/xattr_darwin_amd64.go
Removing vendor/github.com/containerd/continuity/sysx/xattr_darwin_386.go
Removing vendor/github.com/containerd/continuity/sysx/xattr_darwin.go
Removing vendor/github.com/containerd/continuity/sysx/sys.go
Removing vendor/github.com/containerd/continuity/sysx/chmod_solaris.go
Removing vendor/github.com/containerd/continuity/sysx/chmod_linux.go
Removing vendor/github.com/containerd/continuity/sysx/chmod_freebsd_amd64.go
Removing vendor/github.com/containerd/continuity/sysx/chmod_freebsd.go
Removing vendor/github.com/containerd/continuity/sysx/chmod_darwin_amd64.go
Removing vendor/github.com/containerd/continuity/sysx/chmod_darwin_386.go
Removing vendor/github.com/containerd/continuity/sysx/chmod_darwin.go
Removing vendor/github.com/containerd/continuity/sysx/asm.s
Auto-merging vendor/github.com/containerd/continuity/resource_windows.go
Auto-merging vendor/github.com/containerd/continuity/proto/gen.go
Auto-merging vendor/github.com/containerd/continuity/hardlinks_windows.go
Auto-merging vendor/github.com/containerd/continuity/driver/lchmod_unix.go
Auto-merging vendor/github.com/containerd/continuity/driver/lchmod_linux.go
Removing vendor/github.com/containerd/containerd/windows/hcsshimtypes/hcsshim.proto
Removing vendor/github.com/containerd/containerd/windows/hcsshimtypes/hcsshim.pb.go
Removing vendor/github.com/containerd/containerd/task_opts_linux.go
Removing vendor/github.com/containerd/containerd/services/server/server_linux.go
Removing vendor/github.com/containerd/containerd/services/server/server.go
Auto-merging vendor/github.com/containerd/containerd/services/server/config/config.go
Auto-merging vendor/github.com/containerd/containerd/runtime/v2/runc/options/doc.go
Auto-merging vendor/github.com/containerd/containerd/platforms/defaults_unix.go
Removing vendor/github.com/containerd/containerd/oci/spec_unix.go
Removing vendor/github.com/containerd/containerd/oci/spec_opts_unix.go
Auto-merging vendor/github.com/containerd/containerd/mount/mountinfo_bsd.go
Removing vendor/github.com/boltdb/bolt/freelist.go
Removing vendor/github.com/boltdb/bolt/bolt_ppc64.go
Removing vendor/github.com/Nvveen/Gotty/types.go
Removing vendor/github.com/Nvveen/Gotty/parser.go
Removing vendor/github.com/Nvveen/Gotty/gotty.go
Removing vendor/github.com/Nvveen/Gotty/attributes.go
Removing vendor/github.com/Nvveen/Gotty/README
Removing vendor/github.com/Nvveen/Gotty/LICENSE
Removing vendor/github.com/Microsoft/opengcs/service/gcsutils/README
Removing vendor/github.com/Microsoft/opengcs/client/tartovhd.go
Removing vendor/github.com/Microsoft/hcsshim/zhcsshim.go
Removing vendor/github.com/Microsoft/hcsshim/version.go
Removing vendor/github.com/Microsoft/hcsshim/unpreparelayer.go
Removing vendor/github.com/Microsoft/hcsshim/nametoguid.go
Removing vendor/github.com/Microsoft/hcsshim/legacy19.go
Removing vendor/github.com/Microsoft/hcsshim/legacy18.go
Removing vendor/github.com/Microsoft/hcsshim/layerexists.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/wclayer/processimage.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/wclayer/preparelayer.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/wclayer/legacy.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/wclayer/layerutils.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/wclayer/baselayer.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/safefile/safeopen.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/hns/hnsfuncs.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/hcs/waithelper.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/hcs/utils.go
Auto-merging vendor/github.com/Microsoft/hcsshim/internal/hcs/cgo.go
Removing vendor/github.com/Microsoft/hcsshim/importlayer.go
Removing vendor/github.com/Microsoft/hcsshim/guid.go
Removing vendor/github.com/Microsoft/hcsshim/getsharedbaseimages.go
Removing vendor/github.com/Microsoft/hcsshim/getlayermountpath.go
Removing vendor/github.com/Microsoft/hcsshim/exportlayer.go
Removing vendor/github.com/Microsoft/hcsshim/expandsandboxsize.go
Removing vendor/github.com/Microsoft/hcsshim/destroylayer.go
Removing vendor/github.com/Microsoft/hcsshim/deactivatelayer.go
Removing vendor/github.com/Microsoft/hcsshim/createsandboxlayer.go
Removing vendor/github.com/Microsoft/hcsshim/createlayer.go
Removing vendor/github.com/Microsoft/hcsshim/callback.go
Removing vendor/github.com/Microsoft/hcsshim/activatelayer.go
Auto-merging vendor/code.cloudfoundry.org/clock/clock.go
Auto-merging vendor/code.cloudfoundry.org/clock/LICENSE
Removing vendor/archive/tar/writer.go
Removing vendor/archive/tar/stat_unix.go
Removing vendor/archive/tar/reader.go
Removing vendor/archive/tar/common.go
Removing vendor/archive/tar/README.md
Removing registry/service_v1_test.go
Removing registry/service_v1.go
Removing project/CONTRIBUTING.md
Removing plugin/executor/containerd/containerd_test.go
Auto-merging pkg/parsers/operatingsystem/operatingsystem_linux_test.go
Auto-merging oci/oci.go
Removing migrate/v1/migratev1_test.go
Removing migrate/v1/migratev1.go
Auto-merging libcontainerd/types/types_windows.go
Auto-merging libcontainerd/types/types_linux.go
Auto-merging libcontainerd/types/types.go
Auto-merging libcontainerd/remote/client_linux.go
Auto-merging libcontainerd/remote/client.go
Auto-merging libcontainerd/queue/queue_test.go
Auto-merging libcontainerd/queue/queue.go
Auto-merging libcontainerd/local/utils_windows_test.go
Auto-merging libcontainerd/local/utils_windows.go
Auto-merging libcontainerd/local/process_windows.go
Auto-merging libcontainerd/local/local_windows.go
Removing libcontainerd/errors.go
Removing libcontainerd/client_daemon_windows.go
Removing internal/procfs/procfs_linux_test.go
Removing internal/procfs/procfs_linux.go
Auto-merging integration/plugin/logging/logging_linux_test.go
Auto-merging integration/container/ipcmode_linux_test.go
Removing integration-cli/test_vars_noexec_test.go
Removing integration-cli/test_vars_exec_test.go
Removing integration-cli/docker_cli_wait_test.go
Removing integration-cli/docker_cli_service_update_test.go
Removing integration-cli/docker_cli_secret_create_test.go
Removing integration-cli/docker_cli_export_import_test.go
Removing integration-cli/docker_cli_config_create_test.go
Removing integration-cli/docker_api_ipcmode_test.go
Removing integration-cli/docker_api_create_test.go
Removing hack/integration-cli-on-swarm/host/volume.go
Removing hack/integration-cli-on-swarm/host/host.go
Removing hack/integration-cli-on-swarm/host/enumerate_test.go
Removing hack/integration-cli-on-swarm/host/enumerate.go
Removing hack/integration-cli-on-swarm/host/dockercmd.go
Removing hack/integration-cli-on-swarm/host/compose.go
Removing hack/integration-cli-on-swarm/agent/worker/worker.go
Removing hack/integration-cli-on-swarm/agent/worker/executor.go
Removing hack/integration-cli-on-swarm/agent/vendor/github.com/bfirsh/funker-go/handle.go
Removing hack/integration-cli-on-swarm/agent/vendor/github.com/bfirsh/funker-go/call.go
Removing hack/integration-cli-on-swarm/agent/vendor.conf
Removing hack/integration-cli-on-swarm/agent/types/types.go
Removing hack/integration-cli-on-swarm/agent/master/set_test.go
Removing hack/integration-cli-on-swarm/agent/master/set.go
Removing hack/integration-cli-on-swarm/agent/master/master.go
Removing hack/integration-cli-on-swarm/agent/master/call.go
Removing hack/integration-cli-on-swarm/agent/Dockerfile
Removing hack/integration-cli-on-swarm/README.md
Removing distribution/push_v1.go
Removing distribution/pull_v1.go
Auto-merging daemon/oci_linux.go
CONFLICT (content): Merge conflict in daemon/oci_linux.go
Removing daemon/graphdriver/aufs/mount_unsupported.go
Removing daemon/graphdriver/aufs/mount_linux.go
Removing daemon/caps/utils.go
Removing daemon/bindmount_unix.go
Removing cmd/dockerd/hack/malformed_host_override_test.go
Removing cmd/dockerd/hack/malformed_host_override.go
Removing client/session.go
Removing api/server/httputils/errors.go
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2016)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1984)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1980)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1612)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:712)
	at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:122)
	at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1100)
	at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1193)
	at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:120)
	at org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition.create(CpsScmFlowDefinition.java:144)
	at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:120)
	at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:293)
	at hudson.model.ResourceController.execute(ResourceController.java:97)
	at hudson.model.Executor.run(Executor.java:429)
Finished: FAILURE