This job view page is being replaced by Spyglass soon. Check out the new job view.
PRjustinsb: Prune addons via labels
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-10-02 13:25
Elapsed0.00s
Revision
Refs 12156

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/kops at master(4de725cd24f8f844036d079cd75cf17a7375cda9)
# Checking out pulls:
#	12156(27dd721c174f793fddfc75621f58562da39d16c4)
$ 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 198 lines ...
$ git merge --no-ff 27dd721c174f793fddfc75621f58562da39d16c4
Auto-merging upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
CONFLICT (content): Merge conflict in upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
Auto-merging tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content
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