This job view page is being replaced by Spyglass soon. Check out the new job view.
PRmszostok: Replaces the Aggregated API Server with the CustomResourceDefinitions (CRDs) solution
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2019-07-19 06:19
Elapsed0.00s
Revision
Refs 2630

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes-sigs/service-catalog at master(879696fc4c449bd57d9b2a74b3fa51f123b6bcb9)
# Checking out pulls:
#	2630(c624d90c02aad52631d8e539cbc9d5db6de0533a)
$ mkdir -p /home/prow/go/src/github.com/kubernetes-sigs/service-catalog
$ git init
Initialized empty Git repository in /home/prow/go/src/github.com/kubernetes-sigs/service-catalog/.git/
... skipping 153 lines ...
Removing charts/catalog/templates/apiserver-service.yaml
CONFLICT (modify/delete): charts/catalog/templates/apiserver-deployment.yaml deleted in c624d90c02aad52631d8e539cbc9d5db6de0533a and modified in HEAD. Version HEAD of charts/catalog/templates/apiserver-deployment.yaml left in tree.
Removing charts/catalog/templates/apiregistration.yaml
Auto-merging charts/catalog/README.md
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1