This job view page is being replaced by Spyglass soon. Check out the new job view.
PRAlexeyPerevalov: Topology aware scheduler: resources per numa approach
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-09-16 13:51
Elapsed0.00s
Revision
Refs 90708

No Test Failures!


Error lines from build-log.txt

... skipping 29 lines ...

HEAD is now at 8dd1247e5a Merge pull request #19116 from justaugustus/kubekins-bump
$ git branch --force master FETCH_HEAD
$ git checkout master
Switched to branch 'master'
$ git submodule update --init --recursive
# FAILED!
# Cloning kubernetes/kubernetes at master(5d095c8a4427954049341ef8c0464545c03f6acf)
# Checking out pulls:
#	90708(92a497deb3b46945c2072bed4f024e1997fdd86d)
$ mkdir -p /home/prow/go/src/github.com/kubernetes/kubernetes
$ git init
Initialized empty Git repository in /home/prow/go/src/github.com/kubernetes/kubernetes/.git/
... skipping 736 lines ...
Auto-merging pkg/scheduler/algorithmprovider/registry.go
Auto-merging pkg/apis/core/types.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging cmd/kube-scheduler/app/options/options.go
Auto-merging cmd/kube-scheduler/app/options/BUILD
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1