This job view page is being replaced by Spyglass soon. Check out the new job view.
PRtorredil: Merge release-1.5 to master for v1.5.3
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2022-04-19 18:04
Elapsed0.00s
Revision
Refs 1213

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/aws-ebs-csi-driver at master(a2d1d0ff36a99d6df02f0f9dad51b622a943a06e)
# Checking out pulls:
#	1213(682fd3a108e39f169b52a5f90bb67b1b11325099)
$ PWD=/  mkdir -p /home/prow/go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
$ PWD=/home/prow/go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver  git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 285 lines ...
CONFLICT (content): Merge conflict in charts/aws-ebs-csi-driver/Chart.yaml
Auto-merging charts/aws-ebs-csi-driver/CHANGELOG.md
CONFLICT (content): Merge conflict in charts/aws-ebs-csi-driver/CHANGELOG.md
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging CHANGELOG-0.x.md
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1