Recent runs || View in Spyglass
PR | Murphylu1993: Fixed update sts status error while create sts pod failed |
Result | FAILURE |
Tests | 0 failed / 0 succeeded |
Started | |
Elapsed | 0.00s |
Revision | |
Refs |
109346 |
... skipping 116 lines ... HEAD is now at 42f561e2 Merge pull request #2063 from yangjunmyfm192085/metrics-server-add-provider $ PWD=/home/prow/go/src/k8s.io/perf-tests git branch --force master FETCH_HEAD $ PWD=/home/prow/go/src/k8s.io/perf-tests git checkout master Switched to branch 'master' $ PWD=/home/prow/go/src/k8s.io/perf-tests git submodule update --init --recursive # FAILED # Cloning kubernetes/kubernetes at master(28ab02df19148f8b07e40df7eadbb615672640af) # Checking out pulls: # 109346(16c24ee61ff3a50df5ab0f57360128ba45bbfaf4) $ PWD=/ mkdir -p /home/prow/go/src/k8s.io/kubernetes $ PWD=/home/prow/go/src/k8s.io/kubernetes git init hint: Using 'master' as the name for the initial branch. This default branch name ... skipping 943 lines ... $ PWD=/home/prow/go/src/k8s.io/kubernetes git fetch https://github.com/kubernetes/kubernetes.git 16c24ee61ff3a50df5ab0f57360128ba45bbfaf4 From https://github.com/kubernetes/kubernetes * branch 16c24ee61ff3a50df5ab0f57360128ba45bbfaf4 -> FETCH_HEAD $ PWD=/home/prow/go/src/k8s.io/kubernetes 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