This job view page is being replaced by Spyglass soon. Check out the new job view.
PRsedefsavas: 🏃[KCP] Recover from a manual machine deletion
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-04-02 19:21
Elapsed0.00s
Revision
Refs 2841
links{u'resultstore': {u'url': u'https://source.cloud.google.com/results/invocations/a99262d6-c301-40e7-b796-a0bae62e6dd2/targets/test'}}
resultstorehttps://source.cloud.google.com/results/invocations/a99262d6-c301-40e7-b796-a0bae62e6dd2/targets/test

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes-sigs/cluster-api at master(96f0bed8ad151a0bb29584d426fbee893ac59880)
# Checking out pulls:
#	2841(b5312bf9ab22dad214b88214da475312b6bacb8d)
$ mkdir -p /home/prow/go/src/sigs.k8s.io/cluster-api
$ git init
Initialized empty Git repository in /home/prow/go/src/sigs.k8s.io/cluster-api/.git/
... skipping 59 lines ...
From https://github.com/kubernetes-sigs/cluster-api
 * branch                refs/pull/2841/head -> FETCH_HEAD
$ git merge --no-ff b5312bf9ab22dad214b88214da475312b6bacb8d
Auto-merging controlplane/kubeadm/internal/workload_cluster_etcd.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/workload_cluster_etcd.go
Auto-merging controlplane/kubeadm/internal/workload_cluster.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1