This job view page is being replaced by Spyglass soon. Check out the new job view.
PRtedyu: Automated cherry pick of #89055 upstream release 1.17
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-03-20 00:47
Elapsed0.00s
Revision
Refs 89277
links{u'resultstore': {u'url': u'https://source.cloud.google.com/results/invocations/3ba7214b-33f9-4c4a-9665-d41732415f25/targets/test'}}
resultstorehttps://source.cloud.google.com/results/invocations/3ba7214b-33f9-4c4a-9665-d41732415f25/targets/test

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes/kubernetes at master(fe2fdcd6953a877664cbdb784888c0e7f636ce40)
# Checking out pulls:
#	89277(03b18af60c06004ff060565dbc95200b1514a462)
$ mkdir -p /home/prow/go/src/k8s.io/kubernetes
$ git init
Initialized empty Git repository in /home/prow/go/src/k8s.io/kubernetes/.git/
... skipping 840 lines ...
CONFLICT (rename/delete): CHANGELOG-1.8.md deleted in 03b18af60c06004ff060565dbc95200b1514a462 and renamed to CHANGELOG/CHANGELOG-1.8.md in HEAD. Version HEAD of CHANGELOG/CHANGELOG-1.8.md left in tree.
CONFLICT (rename/delete): CHANGELOG-1.4.md deleted in 03b18af60c06004ff060565dbc95200b1514a462 and renamed to CHANGELOG/CHANGELOG-1.4.md in HEAD. Version HEAD of CHANGELOG/CHANGELOG-1.4.md left in tree.
CONFLICT (rename/delete): CHANGELOG-1.3.md deleted in 03b18af60c06004ff060565dbc95200b1514a462 and renamed to CHANGELOG/CHANGELOG-1.3.md in HEAD. Version HEAD of CHANGELOG/CHANGELOG-1.3.md left in tree.
CONFLICT (rename/delete): CHANGELOG-1.2.md deleted in 03b18af60c06004ff060565dbc95200b1514a462 and renamed to CHANGELOG/CHANGELOG-1.2.md in HEAD. Version HEAD of CHANGELOG/CHANGELOG-1.2.md left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 1694 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1