This job view page is being replaced by Spyglass soon. Check out the new job view.
PRrikatz: Add EndPort to Network Policy - Alpha
Tests 0 failed / 0 succeeded
Started2021-02-01 13:52
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
# Cloning kubernetes/kubernetes at master(101cdbf932c9728ce164995b637fac84b5618e1b)
# Checking out pulls:
#	97058(7f06e9ffa8ca9cc29a09c0d56ab08cd13aaa1ccd)
$ mkdir -p /home/prow/go/src/
$ git init
Initialized empty Git repository in /home/prow/go/src/
... skipping 789 lines ...
 * branch                    7f06e9ffa8ca9cc29a09c0d56ab08cd13aaa1ccd -> FETCH_HEAD
$ git merge --no-ff 7f06e9ffa8ca9cc29a09c0d56ab08cd13aaa1ccd
Auto-merging staging/src/
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