This job view page is being replaced by Spyglass soon. Check out the new job view.
PRjustinsb: WIP: GCE: We should now accept CIDRs
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2023-02-05 22:00
Elapsed0.00s
Revision
Refs 12890

No Test Failures!

Error lines from build-log.txt

Environment setup
# Final SHA: 
# Total runtime: 0s
# FAILED
# Cloning kubernetes/kops at master(b899bf644048958f1c2b9a25931f09fb463e713d)
# Checking out pulls:
#	12890(1b7aed816767fc6851ddb69ff03c31b6b695162d)
$ PWD=/  mkdir -p /home/prow/go/src/k8s.io/kops (runtime: 1.281382ms)
$ PWD=/home/prow/go/src/k8s.io/kops  git init (runtime: 4.496328ms)
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 244 lines ...
$ PWD=/home/prow/go/src/k8s.io/kops GIT_AUTHOR_DATE=1675496790 GIT_COMMITTER_DATE=1675496790 git merge --no-ff 1b7aed816767fc6851ddb69ff03c31b6b695162d (runtime: 1.256754884s)
Auto-merging upup/pkg/fi/cloudup/gce/network.go
Auto-merging pkg/apis/kops/validation/legacy.go
CONFLICT (content): Merge conflict in pkg/apis/kops/validation/legacy.go
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3727 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1
# Final SHA: 
# Total runtime: 0s