This job view page is being replaced by Spyglass soon. Check out the new job view.
PRjohngmyers: add replaceBeforeVersion field for channel
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-10-02 13:25
Elapsed0.00s
Revision
Refs 11776

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/kops at master(4de725cd24f8f844036d079cd75cf17a7375cda9)
# Checking out pulls:
#	11776(81ba782f9ad8743e2e244d9235a0dfd53ebfa222)
$ mkdir -p /home/prow/go/src/k8s.io/kops
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 202 lines ...
CONFLICT (content): Merge conflict in channels/pkg/channels/addons_test.go
Auto-merging channels/pkg/channels/addons.go
Auto-merging channels/pkg/channels/addon.go
CONFLICT (content): Merge conflict in channels/pkg/channels/addon.go
Auto-merging channels/pkg/api/channel.go
CONFLICT (content): Merge conflict in channels/pkg/api/channel.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1