This job view page is being replaced by Spyglass soon. Check out the new job view.
PRtheunrealgeek: Fixing upstreams that are shared with canaries
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2022-04-12 16:41
Elapsed0.00s
Revision
Refs 8304

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/ingress-nginx at main(47a266df45bc31928d7891c1c753460deb6df653)
# Checking out pulls:
#	8304(019cd07abf03ef703288daafa83e9fd10dff8ae2)
$ PWD=/  mkdir -p /home/prow/go/src/k8s.io/ingress-nginx
$ PWD=/home/prow/go/src/k8s.io/ingress-nginx  git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 240 lines ...
 * branch                019cd07abf03ef703288daafa83e9fd10dff8ae2 -> FETCH_HEAD
$ PWD=/home/prow/go/src/k8s.io/ingress-nginx GIT_AUTHOR_DATE=1649702527 GIT_COMMITTER_DATE=1649702527 git merge --no-ff 019cd07abf03ef703288daafa83e9fd10dff8ae2
Auto-merging internal/ingress/controller/util.go
CONFLICT (content): Merge conflict in internal/ingress/controller/util.go
Auto-merging internal/ingress/controller/controller_test.go
Auto-merging internal/ingress/controller/controller.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1