This job view page is being replaced by Spyglass soon. Check out the new job view.
PRchaodaiG: Makefiles for clusters manipulation
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-10-16 00:21
Elapsed0.00s
Revision
Refs 23986

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/test-infra at master(ed5bdc5c272d60be08efb72f4513269a188e620e)
# Checking out pulls:
#	23986(80e91e7403b66228ad9e7e63e04fb8fbfbc9e58f)
$ mkdir -p /home/prow/go/src/github.com/kubernetes/test-infra
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 40 lines ...
$ git fetch https://github.com/kubernetes/test-infra.git 80e91e7403b66228ad9e7e63e04fb8fbfbc9e58f
From https://github.com/kubernetes/test-infra
 * branch                  80e91e7403b66228ad9e7e63e04fb8fbfbc9e58f -> FETCH_HEAD
$ git merge --no-ff 80e91e7403b66228ad9e7e63e04fb8fbfbc9e58f
Auto-merging config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
CONFLICT (content): Merge conflict in config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1