This job view page is being replaced by Spyglass soon. Check out the new job view.
PRwfernandes: ‚ú®Support specific kubeconfig context in clusterctl
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-04-02 23:10
Elapsed0.00s
Revision
Refs 2856
links{u'resultstore': {u'url': u'https://source.cloud.google.com/results/invocations/39939187-65de-4618-bd20-4d6477558607/targets/test'}}
resultstorehttps://source.cloud.google.com/results/invocations/39939187-65de-4618-bd20-4d6477558607/targets/test

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes-sigs/cluster-api at master(edb585e03ee23fb4d34aba7e69058c5e6b30abd4)
# Checking out pulls:
#	2856(39ade5a785ed9ad895654f68ad5eba546f23849b)
$ 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 61 lines ...
$ git merge --no-ff 39ade5a785ed9ad895654f68ad5eba546f23849b
Auto-merging cmd/clusterctl/internal/test/fake_proxy.go
CONFLICT (content): Merge conflict in cmd/clusterctl/internal/test/fake_proxy.go
Auto-merging cmd/clusterctl/client/cluster/proxy.go
CONFLICT (content): Merge conflict in cmd/clusterctl/client/cluster/proxy.go
Auto-merging cmd/clusterctl/client/cluster/client.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1