This job view page is being replaced by Spyglass soon. Check out the new job view.
PRstevehipwell: [chart] Node update strategy & auto driver image tag
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-07-28 08:22
Elapsed0.00s
Revision
Refs 988

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/aws-ebs-csi-driver at master(38a2bfacfb92d85c7163b4e0c1ba63e1fefe1434)
# Checking out pulls:
#	988(95cd6f56d90a24cc38b1f13d667c55bb8cc96a29)
$ mkdir -p /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 120 lines ...
 * branch              95cd6f56d90a24cc38b1f13d667c55bb8cc96a29 -> FETCH_HEAD
$ git merge --no-ff 95cd6f56d90a24cc38b1f13d667c55bb8cc96a29
Auto-merging charts/aws-ebs-csi-driver/values.yaml
CONFLICT (content): Merge conflict in charts/aws-ebs-csi-driver/values.yaml
Auto-merging charts/aws-ebs-csi-driver/Chart.yaml
CONFLICT (content): Merge conflict in charts/aws-ebs-csi-driver/Chart.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1