This job view page is being replaced by Spyglass soon. Check out the new job view.
PRxing-yang: Fix the race between PVC finalizer and snapshot finalizer removal
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-08-30 01:48
Elapsed0.00s
Revision
Refs 360

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes-csi/external-snapshotter at master(4f3b02aaa00e2b4e7c9faf46ac88d68d618c8f86)
# Checking out pulls:
#	360(e077f67291cec16ad88c6f0cadf94bf30cb921d1)
$ 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 60 lines ...
From https://github.com/kubernetes-csi/external-snapshotter
 * branch              refs/pull/360/head -> FETCH_HEAD
$ git merge --no-ff e077f67291cec16ad88c6f0cadf94bf30cb921d1
Auto-merging pkg/common-controller/snapshot_controller.go
CONFLICT (content): Merge conflict in pkg/common-controller/snapshot_controller.go
Auto-merging pkg/common-controller/framework_test.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1