Merge pull request #5507 from slonopotamus/containerd-2 #5201

Job	Run time
prepare	1s
test / prepare	2m 30s
test / run (containerd, ./frontend/dockerfile, integration)	5m 9s
test / run (containerd, ./frontend/dockerfile, dockerfile)	7m 4s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	5m 25s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	6m 59s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	5m 8s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	7m 38s
test / run (containerd-1.7, ./frontend/dockerfile, integration)	5m 11s
test / run (containerd-1.7, ./frontend/dockerfile, dockerfile)	7m 39s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	5m 42s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	7m 51s
test / run (oci, ./frontend/dockerfile, integration)	5m 13s
test / run (oci, ./frontend/dockerfile, dockerfile)	6m 27s
test / run (oci-rootless, ./frontend/dockerfile, integration)	5m 3s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	6m 18s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 51s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	6m 10s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 41s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	6m 20s
image (mainline)	5m 57s
image (labs)	5m 46s
scout (master)	27s
scout (master-labs)	33s
release	0s
	2h 4m 3s

Provide feedback