This job view page is being replaced by Spyglass soon. Check out the new job view.
PRolemarkus: Avoid setting hostname-override
Tests 0 failed / 0 succeeded
Started2021-10-02 13:25
Refs 12245

No Test Failures!

Error lines from build-log.txt

Environment setup
# Cloning kubernetes/kops at master(4de725cd24f8f844036d079cd75cf17a7375cda9)
# Checking out pulls:
#	12245(64d3bfb1f0003210f66ad4d5f24b2402c6c97795)
$ mkdir -p /home/prow/go/src/
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 585 lines ...
Auto-merging pkg/model/components/kubeproxy.go
Auto-merging nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml
CONFLICT (content): Merge conflict in nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml
Auto-merging nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml
CONFLICT (content): Merge conflict in nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml
Auto-merging nodeup/pkg/model/context.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1