This job view page is being replaced by Spyglass soon. Check out the new job view.
PRbmelbourne: Set default container runtime to containerd
Tests 0 failed / 0 succeeded
Started2021-01-16 12:16
Refs 10370

No Test Failures!

Error lines from build-log.txt

Environment setup
# Cloning kubernetes/kops at master(a051af8dc068b08c9d633ffd78351fb6094cf730)
# Checking out pulls:
#	10370(ac6b95b63efd0847efad04fbc433a365d8fb661b)
$ mkdir -p /home/prow/go/src/
$ git init
Initialized empty Git repository in /home/prow/go/src/
... skipping 492 lines ...
Auto-merging tests/integration/create_cluster/complex/options.yaml
CONFLICT (content): Merge conflict in tests/integration/create_cluster/complex/options.yaml
Auto-merging tests/integration/create_cluster/complex/expected-v1alpha2.yaml
CONFLICT (content): Merge conflict in tests/integration/create_cluster/complex/expected-v1alpha2.yaml
Auto-merging docs/releases/
CONFLICT (content): Merge conflict in docs/releases/
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1