This job view page is being replaced by Spyglass soon. Check out the new job view.
PRdims: Switch containerd cri e2e to the right project
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-02-27 01:16
Elapsed0.00s
Revision
Refs 21055

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/test-infra at master(44434ce0aeca1f3a8319f2846d3d9295829d41df)
# Checking out pulls:
#	21055(bed98f13c46e457ef8c91a1b91b7f8993418c41a)
$ mkdir -p /home/prow/go/src/github.com/kubernetes/test-infra
$ git init
Initialized empty Git repository in /home/prow/go/src/github.com/kubernetes/test-infra/.git/
... skipping 31 lines ...
From https://github.com/kubernetes/test-infra
 * branch                  bed98f13c46e457ef8c91a1b91b7f8993418c41a -> FETCH_HEAD
$ git merge --no-ff bed98f13c46e457ef8c91a1b91b7f8993418c41a
Auto-merging config/jobs/containerd/cri/containerd-cri-presubmit-jobs.yaml
CONFLICT (content): Merge conflict in config/jobs/containerd/cri/containerd-cri-presubmit-jobs.yaml
Auto-merging config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1