This job view page is being replaced by Spyglass soon. Check out the new job view.
PRXenwar: ✨ Allow Trunk configuration at a Port level
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-07-30 06:56
Elapsed0.00s
Revision
Refs 934

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/cluster-api-provider-openstack at master(22f77e62fb271232dc34365ce1b9791e905392b0)
# Checking out pulls:
#	934(7d36986a06e3414b03f6ce9305b0d647a6463a35)
$ mkdir -p /home/prow/go/src/sigs.k8s.io/cluster-api-provider-openstack
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 55 lines ...
Auto-merging config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml
Auto-merging config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml
Auto-merging config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml
Auto-merging api/v1alpha4/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in api/v1alpha4/zz_generated.deepcopy.go
Auto-merging api/v1alpha4/types.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1