This job view page is being replaced by Spyglass soon. Check out the new job view.
PRvenkatnsrinivasan: Added qemu image support for opensuse 15.3 Cloud image
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2022-05-10 07:08
Elapsed0.00s
Revision
Refs 840

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/image-builder at master(fdf8a50a3a691b8f94b5b46f349ad0815cbe47fb)
# Checking out pulls:
#	840(03dd1a74459ca1aed15b8ae57a43c1e59cd3580e)
$ PWD=/  mkdir -p /home/prow/go/src/sigs.k8s.io/image-builder
$ PWD=/home/prow/go/src/sigs.k8s.io/image-builder  git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 55 lines ...
$ PWD=/home/prow/go/src/sigs.k8s.io/image-builder GIT_AUTHOR_DATE=1652134664 GIT_COMMITTER_DATE=1652134664 git merge --no-ff 03dd1a74459ca1aed15b8ae57a43c1e59cd3580e
Auto-merging images/capi/packer/qemu/packer.json
CONFLICT (content): Merge conflict in images/capi/packer/qemu/packer.json
Auto-merging images/capi/ansible/roles/setup/tasks/main.yml
Auto-merging images/capi/Makefile
CONFLICT (content): Merge conflict in images/capi/Makefile
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1