This job view page is being replaced by Spyglass soon. Check out the new job view.
PRMurphylu1993: Fixed update sts status error while create sts pod failed
Tests 0 failed / 0 succeeded
Started2022-05-14 11:55
Refs 109346

No Test Failures!

Error lines from build-log.txt

... skipping 116 lines ...

HEAD is now at 42f561e2 Merge pull request #2063 from yangjunmyfm192085/metrics-server-add-provider
$ PWD=/home/prow/go/src/  git branch --force master FETCH_HEAD
$ PWD=/home/prow/go/src/  git checkout master
Switched to branch 'master'
$ PWD=/home/prow/go/src/  git submodule update --init --recursive
# Cloning kubernetes/kubernetes at master(28ab02df19148f8b07e40df7eadbb615672640af)
# Checking out pulls:
#	109346(16c24ee61ff3a50df5ab0f57360128ba45bbfaf4)
$ PWD=/  mkdir -p /home/prow/go/src/
$ PWD=/home/prow/go/src/  git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 943 lines ...
$ PWD=/home/prow/go/src/  git fetch 16c24ee61ff3a50df5ab0f57360128ba45bbfaf4
 * branch                    16c24ee61ff3a50df5ab0f57360128ba45bbfaf4 -> FETCH_HEAD
$ PWD=/home/prow/go/src/ GIT_AUTHOR_DATE=1652513839 GIT_COMMITTER_DATE=1652513839 git merge --no-ff 16c24ee61ff3a50df5ab0f57360128ba45bbfaf4
Auto-merging pkg/controller/statefulset/stateful_set_control.go
CONFLICT (content): Merge conflict in pkg/controller/statefulset/stateful_set_control.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1