This job view page is being replaced by Spyglass soon. Check out the new job view.
PRhakman: Update containerd and Docker for kOps 1.21
Tests 0 failed / 0 succeeded
Started2021-10-09 04:11
Refs 12507

No Test Failures!

Error lines from build-log.txt

Environment setup
# Cloning kubernetes/kops at master(7d40f456d908984096c5bced514f6ec63b64225d)
# Checking out pulls:
#	12507(69e255f3dedab1757e29dea9dc3fe35410d893f9)
$ mkdir -p /home/prow/go/src/
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 810 lines ...
CONFLICT (content): Merge conflict in WORKSPACE
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging .shipbot.yaml
Auto-merging .github/workflows/main.yml
CONFLICT (content): Merge conflict in .github/workflows/main.yml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1