This job view page is being replaced by Spyglass soon. Check out the new job view.
PRJont828: Add clusterv1.ReadyCondition to AzureMachinePool and AzureMachinePoolMachine
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2022-06-24 23:33
Elapsed0.00s
Revision
Refs 2303

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/cluster-api-provider-azure at main(8ed243e1159a4cb14a60df963eca84a999f30840)
# Checking out pulls:
#	2303(33556eef2fec8bdae16f8abfe72e5605af94951d)
$ PWD=/  mkdir -p /home/prow/go/src/sigs.k8s.io/cluster-api-provider-azure
$ PWD=/home/prow/go/src/sigs.k8s.io/cluster-api-provider-azure  git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 86 lines ...
From https://github.com/kubernetes-sigs/cluster-api-provider-azure
 * branch              33556eef2fec8bdae16f8abfe72e5605af94951d -> FETCH_HEAD
$ PWD=/home/prow/go/src/sigs.k8s.io/cluster-api-provider-azure GIT_AUTHOR_DATE=1656108658 GIT_COMMITTER_DATE=1656108658 git merge --no-ff 33556eef2fec8bdae16f8abfe72e5605af94951d
Auto-merging azure/scope/machinepoolmachine_test.go
CONFLICT (content): Merge conflict in azure/scope/machinepoolmachine_test.go
Auto-merging azure/scope/machinepool.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1