This job view page is being replaced by Spyglass soon. Check out the new job view.
PRhakman: Update Calico to v3.20.0
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-08-02 05:48
Elapsed0.00s
Revision
Refs 12088

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/kops at master(a9207f4a6cf8507bdf8349903f889795fa19ed88)
# Checking out pulls:
#	12088(6e3d23d6f300f2bc5b47d1ed53380b6bf4a769be)
$ 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 192 lines ...
$ git fetch https://github.com/kubernetes/kops.git 6e3d23d6f300f2bc5b47d1ed53380b6bf4a769be
From https://github.com/kubernetes/kops
 * branch                  6e3d23d6f300f2bc5b47d1ed53380b6bf4a769be -> FETCH_HEAD
$ git merge --no-ff 6e3d23d6f300f2bc5b47d1ed53380b6bf4a769be
Auto-merging tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content
CONFLICT (content): Merge conflict in tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1