This job view page is being replaced by Spyglass soon. Check out the new job view.
PRspiffxp: [wip] testing out integration 1.22 canary job
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-10-05 20:31
Elapsed0.00s
Revision
Refs 105488

No Test Failures!


Error lines from build-log.txt

... skipping 135 lines ...

HEAD is now at 92d6a60f4 Merge pull request #811 from kubernetes-sigs/remove-msi-path
$ git branch --force master FETCH_HEAD
$ git checkout master
Switched to branch 'master'
$ git submodule update --init --recursive
# FAILED
# Cloning kubernetes/kubernetes at release-1.22(39a3dc822461a2d2d9457af383ce7dfba23e726c)
# Checking out pulls:
#	105488(9cb0c403df65defb3844e87e9d0a09495a231120)
$ mkdir -p /home/prow/go/src/k8s.io/kubernetes
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 1424 lines ...
CONFLICT (content): Merge conflict in build/build-image/cross/VERSION
Removing LICENSES/vendor/github.com/coreos/go-systemd/LICENSE
Auto-merging LICENSES/vendor/github.com/bits-and-blooms/bitset/LICENSE
CONFLICT (modify/delete): CHANGELOG/CHANGELOG-1.21.md deleted in HEAD and modified in 9cb0c403df65defb3844e87e9d0a09495a231120. Version 9cb0c403df65defb3844e87e9d0a09495a231120 of CHANGELOG/CHANGELOG-1.21.md left in tree.
CONFLICT (modify/delete): CHANGELOG/CHANGELOG-1.20.md deleted in HEAD and modified in 9cb0c403df65defb3844e87e9d0a09495a231120. Version 9cb0c403df65defb3844e87e9d0a09495a231120 of CHANGELOG/CHANGELOG-1.20.md left in tree.
CONFLICT (modify/delete): CHANGELOG/CHANGELOG-1.19.md deleted in HEAD and modified in 9cb0c403df65defb3844e87e9d0a09495a231120. Version 9cb0c403df65defb3844e87e9d0a09495a231120 of CHANGELOG/CHANGELOG-1.19.md left in tree.
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1