This job view page is being replaced by Spyglass soon. Check out the new job view.
PRDOboznyi: Removed default hostname-override
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-01-17 18:04
Elapsed0.00s
Revision
Refs 10595

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/kops at master(892aca0dfe032f25c8c20581ebe06402fa4285bf)
# Checking out pulls:
#	10595(ba40cc8732fd0934b14f85908bc0e2a01d4038e9)
$ 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 314 lines ...
CONFLICT (content): Merge conflict in tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
Auto-merging tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
CONFLICT (content): Merge conflict in tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
Auto-merging tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
CONFLICT (content): Merge conflict in tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
Auto-merging pkg/model/components/kubelet.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1