This job view page is being replaced by Spyglass soon. Check out the new job view.
PRtallclair: Podsecurity webhook
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-07-07 06:54
Elapsed0.00s
Revision
Refs 103465

No Test Failures!


Error lines from build-log.txt

... skipping 30 lines ...

HEAD is now at 93c1fb2 replacing k/k8s.io links in docs (#263)
$ git branch --force master FETCH_HEAD
$ git checkout master
Switched to branch 'master'
$ git submodule update --init --recursive
# FAILED
# Cloning kubernetes/kubernetes at master(656d00e8949f64cd663ca532d12e00982a6664c4)
# Checking out pulls:
#	103465(b4408616e4187537eb6d1bf03f550aab47bf9a04)
$ mkdir -p /home/prow/go/src/k8s.io/kubernetes
$ git init
Initialized empty Git repository in /home/prow/go/src/k8s.io/kubernetes/.git/
... skipping 842 lines ...
CONFLICT (add/add): Merge conflict in staging/src/k8s.io/pod-security-admission/admission/attributes.go
Auto-merging staging/src/k8s.io/pod-security-admission/admission/attributes.go
Auto-merging staging/src/k8s.io/pod-security-admission/admission/admission.go
CONFLICT (content): Merge conflict in staging/src/k8s.io/pod-security-admission/admission/admission.go
Auto-merging plugin/pkg/admission/security/podsecurity/admission.go
CONFLICT (content): Merge conflict in plugin/pkg/admission/security/podsecurity/admission.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1