This job view page is being replaced by Spyglass soon. Check out the new job view.
PRDangerOnTheRanger: Move credential provider code to staging/
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-11-12 20:11
Elapsed0.00s
Revision
Refs 95775

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/kubernetes at master(5cfce4e5cb4dc6ff429c088ec25973e2ebae2d86)
# Checking out pulls:
#	95775(2696d5b5450b4a02b3d724bd431976191f71faf5)
$ mkdir -p /home/prow/go/src/k8s.io/kubernetes
$ git init
Initialized empty Git repository in /home/prow/go/src/k8s.io/kubernetes/.git/
... skipping 948 lines ...
Auto-merging cmd/cloud-controller-manager/BUILD
CONFLICT (content): Merge conflict in cmd/cloud-controller-manager/BUILD
Auto-merging cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml
Auto-merging cluster/addons/dns/nodelocaldns/nodelocaldns.yaml
Auto-merging build/pause/windows/pause.c
Auto-merging CHANGELOG/CHANGELOG-1.18.md
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1