This job view page is being replaced by Spyglass soon. Check out the new job view.
PRxing-yang: WIP: Split the controller into common and sidecar controllers
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2019-10-02 22:41
Elapsed0.00s
Revision
Refs 166

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes-csi/external-snapshotter at master(1a2decddf72a9e5cc8779ed649c7e52cf1eb20fd)
# Checking out pulls:
#	166(068a8e2e7c74bd6694cf97f0867024f091e3ddf6)
$ mkdir -p /home/prow/go/src/github.com/kubernetes-csi/external-snapshotter
$ git init
Initialized empty Git repository in /home/prow/go/src/github.com/kubernetes-csi/external-snapshotter/.git/
... skipping 46 lines ...
CONFLICT (content): Merge conflict in pkg/sidecar_controller/snapshot_controller.go
Auto-merging pkg/sidecar_controller/csi_handler.go
Auto-merging deploy/kubernetes/setup-csi-snapshotter.yaml
CONFLICT (content): Merge conflict in deploy/kubernetes/setup-csi-snapshotter.yaml
Auto-merging cmd/csi-snapshotter-sidecar/main.go
Removing Dockerfile
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1