This job view page is being replaced by Spyglass soon. Check out the new job view.
PRgab-satchi: Adds controller logic to support Supervisor types
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-11-23 20:38
Elapsed0.00s
Revision
Refs 1309

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/cluster-api-provider-vsphere at master(f2977d84170217114ef111c0017009de9a069ac1)
# Checking out pulls:
#	1309(9844dec2a9fc2a5094692a1e283f7d1741605d7f)
$ mkdir -p /home/prow/go/src/sigs.k8s.io/cluster-api-provider-vsphere
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 95 lines ...
$ git fetch https://github.com/kubernetes-sigs/cluster-api-provider-vsphere.git 9844dec2a9fc2a5094692a1e283f7d1741605d7f
From https://github.com/kubernetes-sigs/cluster-api-provider-vsphere
 * branch              9844dec2a9fc2a5094692a1e283f7d1741605d7f -> FETCH_HEAD
$ git merge --no-ff 9844dec2a9fc2a5094692a1e283f7d1741605d7f
Auto-merging controllers/vspheremachine_controller.go
CONFLICT (content): Merge conflict in controllers/vspheremachine_controller.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1