This job view page is being replaced by Spyglass soon. Check out the new job view.
PRyastij: Add metadata field to the VSphereMachineTemplate
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-07-13 20:14
Elapsed0.00s
Revision
Refs 1210

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/cluster-api-provider-vsphere at release-0.7(7e1a78f2035d64321604a45195572fdc5f72f637)
# Checking out pulls:
#	1210(d677557e94c4a099deb6dbd6401720b0c85fa810)
$ 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 90 lines ...
$ git merge --no-ff d677557e94c4a099deb6dbd6401720b0c85fa810
Auto-merging config/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml
Auto-merging api/v1alpha3/zz_generated.deepcopy.go
Auto-merging api/v1alpha2/zz_generated.conversion.go
Auto-merging api/v1alpha2/vspheremachinetemplate_conversion.go
CONFLICT (content): Merge conflict in api/v1alpha2/vspheremachinetemplate_conversion.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1