This job view page is being replaced by Spyglass soon. Check out the new job view.
PRaramase: Automated cherry pick of #1144: release: update manifest and helm charts for v1.3.1
Tests 0 failed / 0 succeeded
Started2023-01-21 00:09
Refs 1145

No Test Failures!

Error lines from build-log.txt

Environment setup
# Final SHA: 
# Total runtime: 0s
# Cloning kubernetes-sigs/secrets-store-csi-driver at release-1.3(4fc1e6d6c35b6a26e3c7a72ad4114afc0195bcf7)
# Checking out pulls:
#	1145(b79dccff1e83b414b0e414f863e9609bffc65dd6)
$ PWD=/  mkdir -p /home/prow/go/src/ (runtime: 1.59133ms)
$ PWD=/home/prow/go/src/  git init (runtime: 4.891719ms)
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 98 lines ...
CONFLICT (content): Merge conflict in charts/secrets-store-csi-driver/values.yaml
Auto-merging charts/secrets-store-csi-driver/
CONFLICT (content): Merge conflict in charts/secrets-store-csi-driver/
Auto-merging charts/secrets-store-csi-driver/Chart.yaml
CONFLICT (content): Merge conflict in charts/secrets-store-csi-driver/Chart.yaml
Auto-merging Makefile
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1
# Final SHA: 
# Total runtime: 0s