This job view page is being replaced by Spyglass soon. Check out the new job view.
PRvincepri: ⚠️ Allow nil for ClusterNetwork's Services and Pods
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2019-08-22 21:20
Elapsed0.00s
Revision
Refs 1310

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes-sigs/cluster-api at master(8bed7bad63b6c67aea75c40ce53bb28bdea4b358)
# Checking out pulls:
#	1310(4fcbb7bcb78538051387792f4a696c57c130df19)
$ 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 38 lines ...
$ git fetch https://github.com/kubernetes-sigs/cluster-api.git pull/1310/head
From https://github.com/kubernetes-sigs/cluster-api
 * branch                refs/pull/1310/head -> FETCH_HEAD
$ git merge --no-ff 4fcbb7bcb78538051387792f4a696c57c130df19
Auto-merging api/v1alpha2/cluster_types.go
CONFLICT (content): Merge conflict in api/v1alpha2/cluster_types.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1