This job view page is being replaced by Spyglass soon. Check out the new job view.
PRjustinsb: WIP: Update containerd to 1.5.2 for kubernetes >= 1.22
Tests 0 failed / 0 succeeded
Started2021-10-02 13:25
Refs 11913

No Test Failures!

Error lines from build-log.txt

Environment setup
# Cloning kubernetes/kops at master(4de725cd24f8f844036d079cd75cf17a7375cda9)
# Checking out pulls:
#	11913(fb3c8aeabd3b52017d68a2b78a205e91d8e8fac8)
$ mkdir -p /home/prow/go/src/
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 195 lines ...
$ git fetch fb3c8aeabd3b52017d68a2b78a205e91d8e8fac8
 * branch                  fb3c8aeabd3b52017d68a2b78a205e91d8e8fac8 -> FETCH_HEAD
$ git merge --no-ff fb3c8aeabd3b52017d68a2b78a205e91d8e8fac8
Auto-merging pkg/model/components/containerd.go
CONFLICT (content): Merge conflict in pkg/model/components/containerd.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1