Recent runs || View in Spyglass
PR | Porges: Quantity doc fixes |
Result | FAILURE |
Tests | 0 failed / 0 succeeded |
Started | |
Elapsed | 0.00s |
Revision | |
Refs |
110023 |
... 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(69cabe778bccfc5f4fa9b6788c9def005e7d959d) # Checking out pulls: # 110023(f9696296866d092663d32464dceff2f40eed913c) $ 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 945 lines ... * branch f9696296866d092663d32464dceff2f40eed913c -> FETCH_HEAD $ PWD=/home/prow/go/src/k8s.io/kubernetes GIT_AUTHOR_DATE=1652619977 GIT_COMMITTER_DATE=1652619977 git merge --no-ff f9696296866d092663d32464dceff2f40eed913c CONFLICT (modify/delete): api/openapi-spec/v3/apis__node.k8s.io__v1beta1_openapi.json deleted in HEAD and modified in f9696296866d092663d32464dceff2f40eed913c. Version f9696296866d092663d32464dceff2f40eed913c of api/openapi-spec/v3/apis__node.k8s.io__v1beta1_openapi.json left in tree. CONFLICT (modify/delete): api/openapi-spec/v3/apis__batch__v1beta1_openapi.json deleted in HEAD and modified in f9696296866d092663d32464dceff2f40eed913c. Version f9696296866d092663d32464dceff2f40eed913c of api/openapi-spec/v3/apis__batch__v1beta1_openapi.json left in tree. CONFLICT (modify/delete): api/openapi-spec/v3/apis__autoscaling__v2beta1_openapi.json deleted in HEAD and modified in f9696296866d092663d32464dceff2f40eed913c. Version f9696296866d092663d32464dceff2f40eed913c of api/openapi-spec/v3/apis__autoscaling__v2beta1_openapi.json left in tree. Auto-merging api/openapi-spec/swagger.json Automatic merge failed; fix conflicts and then commit the result. # Error: exit status 1