Merge pull request #46434 from vvoland/test-ignore-cgroup-check

hack: Add TEST_IGNORE_CGROUP_CHECK

Makefile

@@ -60,6 +60,7 @@ DOCKER_ENVS := \
 	-e TEST_INTEGRATION_FAIL_FAST \
 	-e TEST_SKIP_INTEGRATION \
 	-e TEST_SKIP_INTEGRATION_CLI \
+	-e TEST_IGNORE_CGROUP_CHECK \
 	-e TESTCOVERAGE \
 	-e TESTDEBUG \
 	-e TESTDIRS \

hack/make/.integration-daemon-start

@@ -70,7 +70,7 @@ fi
 
 dockerd="dockerd"
 if [ -f "/sys/fs/cgroup/cgroup.controllers" ]; then
-	if [ -z "$TEST_SKIP_INTEGRATION_CLI" ]; then
+	if [ -z "$TEST_IGNORE_CGROUP_CHECK" ] && [ -z "$TEST_SKIP_INTEGRATION_CLI" ]; then
 		echo >&2 '# cgroup v2 requires TEST_SKIP_INTEGRATION_CLI to be set'
 		exit 1
 	fi