This job view page is being replaced by Spyglass soon. Check out the new job view.
PRjuan-lee: ⚠️ MachinePool API Controller Implementation
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-02-15 23:20
Elapsed0.00s
Revision
Refs 1952

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes-sigs/cluster-api at master(4fd4c7f2c7cd67c9cbd1609e2fa52b2a0cc98dcc)
# Checking out pulls:
#	1952(e236dfc5d34858d702bbc7bf00d5528142ca6c27)
$ 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 50 lines ...
$ git fetch https://github.com/kubernetes-sigs/cluster-api.git pull/1952/head
From https://github.com/kubernetes-sigs/cluster-api
 * branch                refs/pull/1952/head -> FETCH_HEAD
$ git merge --no-ff e236dfc5d34858d702bbc7bf00d5528142ca6c27
Auto-merging config/crd/bases/cluster.x-k8s.io_machinepools.yaml
CONFLICT (content): Merge conflict in config/crd/bases/cluster.x-k8s.io_machinepools.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1