This job view page is being replaced by Spyglass soon. Check out the new job view.
PRolemarkus: Render addons and channel manifest during task execution
Tests 0 failed / 0 succeeded
Started2021-10-02 13:25
Refs 12035

No Test Failures!

Error lines from build-log.txt

Environment setup
# Cloning kubernetes/kops at master(4de725cd24f8f844036d079cd75cf17a7375cda9)
# Checking out pulls:
#	12035(81c270172344495884271986b5420c78523aa89f)
$ mkdir -p /home/prow/go/src/
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 200 lines ...
Auto-merging upup/pkg/fi/cloudup/bootstrapchannelbuilder/template_functions_test.go
Auto-merging upup/pkg/fi/cloudup/bootstrapchannelbuilder/template_functions.go
Auto-merging upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
Auto-merging upup/pkg/fi/cloudup/apply_cluster.go
Auto-merging upup/pkg/fi/cloudup/BUILD.bazel
CONFLICT (content): Merge conflict in upup/pkg/fi/cloudup/BUILD.bazel
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1