This job view page is being replaced by Spyglass soon. Check out the new job view.
PRrikatz: Add EndPort to Network Policy - Alpha
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-02-01 13:34
Elapsed0.00s
Revision
Refs 97058

No Test Failures!


Error lines from build-log.txt

... skipping 30 lines ...

HEAD is now at a404539b56 Merge pull request #20685 from rifelpet/kubetest2
$ git branch --force master FETCH_HEAD
$ git checkout master
Switched to branch 'master'
$ git submodule update --init --recursive
# FAILED
# Cloning kubernetes/kubernetes at master(101cdbf932c9728ce164995b637fac84b5618e1b)
# Checking out pulls:
#	97058(2cce981c0ccb15985340e50c4f9ce371bdc5e752)
$ 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 789 lines ...
From https://github.com/kubernetes/kubernetes
 * branch                    2cce981c0ccb15985340e50c4f9ce371bdc5e752 -> FETCH_HEAD
$ git merge --no-ff 2cce981c0ccb15985340e50c4f9ce371bdc5e752
Auto-merging staging/src/k8s.io/api/extensions/v1beta1/types.go
Auto-merging pkg/features/kube_features.go
CONFLICT (content): Merge conflict in pkg/features/kube_features.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1