This job view page is being replaced by Spyglass soon. Check out the new job view.
PRnolancon: [WIP] Update TopologyManager Feature Gate
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-02-14 11:59
Elapsed0.00s
Revision
Refs 87650

No Test Failures!


Error lines from build-log.txt

... skipping 23 lines ...

HEAD is now at db7f45788... Merge pull request #16294 from matthyx/repo2
$ git branch --force master FETCH_HEAD
$ git checkout master
Switched to branch 'master'
$ git submodule update --init --recursive
# FAILED!
# Cloning kubernetes/kubernetes at master(81b6980d7f6e61b88a2348ccef07371c5d2697a8)
# Checking out pulls:
#	87650(379758e2a8d2e0959a40ceb17a5346fcbff95736)
$ 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 645 lines ...
From https://github.com/kubernetes/kubernetes
 * branch                    refs/pull/87650/head -> FETCH_HEAD
$ git merge --no-ff 379758e2a8d2e0959a40ceb17a5346fcbff95736
Auto-merging pkg/kubelet/cm/topologymanager/topology_manager.go
CONFLICT (content): Merge conflict in pkg/kubelet/cm/topologymanager/topology_manager.go
Auto-merging pkg/features/kube_features.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1