ci: revert #4020 #6756

Job	Run time
cross-i386	1m 21s
cross-i386 (runc_nodmz)	1m 12s
test (ubuntu-20.04, 1.22.x, rootless, -race)	7m 30s
test (ubuntu-20.04, 1.22.x, rootless)	7m 6s
test (ubuntu-20.04, 1.22.x, -race)	8m 0s
test (ubuntu-20.04, 1.22.x)	7m 15s
test (ubuntu-20.04, 1.23.x, rootless, -race)	7m 27s
test (ubuntu-20.04, 1.23.x, rootless)	7m 8s
test (ubuntu-20.04, 1.23.x, -race)	8m 6s
test (ubuntu-20.04, 1.23.x)	7m 3s
test (ubuntu-20.04, 1.23.x, criu-dev)	7m 50s
test (ubuntu-24.04, 1.22.x, rootless, -race)	9m 32s
test (ubuntu-24.04, 1.22.x, rootless)	9m 52s
test (ubuntu-24.04, 1.22.x, -race)	8m 8s
test (ubuntu-24.04, 1.22.x)	7m 26s
test (ubuntu-24.04, 1.23.x, rootless, -race)	9m 43s
test (ubuntu-24.04, 1.23.x, rootless)	9m 16s
test (ubuntu-24.04, 1.23.x, -race)	8m 5s
test (ubuntu-24.04, 1.23.x)	7m 19s
test (ubuntu-24.04, 1.23.x, runc_nodmz)	7m 13s
test (ubuntu-24.04, 1.23.x, criu-dev)	7m 50s
test (actuated-arm64-6cpu-8gb, 1.23.x, rootless)	12m 11s
test (actuated-arm64-6cpu-8gb, 1.23.x)	8m 36s
all-done	1s
	2h 55m 10s

Provide feedback