This job view page is being replaced by Spyglass soon. Check out the new job view.
PRhakman: Update default instance types for AWS
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-01-18 06:49
Elapsed0.00s
Revision
Refs 8282

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes/kops at master(412ed66f9b430f768f34766968626797ce8d8b7e)
# Checking out pulls:
#	8282(d83a3c645d216983a7da6da64bd53820b8331bd4)
$ mkdir -p /home/prow/go/src/k8s.io/kops
$ git init
Initialized empty Git repository in /home/prow/go/src/k8s.io/kops/.git/
... skipping 101 lines ...
$ git fetch https://github.com/kubernetes/kops.git pull/8282/head
From https://github.com/kubernetes/kops
 * branch                refs/pull/8282/head -> FETCH_HEAD
$ git merge --no-ff d83a3c645d216983a7da6da64bd53820b8331bd4
Auto-merging docs/releases/1.18-NOTES.md
CONFLICT (add/add): Merge conflict in docs/releases/1.18-NOTES.md
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1