From c2004fb8c4fdea8d48296f7ba92bcf981ba86978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Fri, 8 Sep 2023 13:39:11 +0200 Subject: [PATCH] hack: Add TEST_IGNORE_CGROUP_CHECK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add env variable that allows to run integration-cli tests with cgroup v2 enabled. Signed-off-by: Paweł Gronowski --- Makefile | 1 + hack/make/.integration-daemon-start | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8ffdf4221c..627abb269b 100644 --- a/Makefile +++ b/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 \ diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start index 11508758ef..e667d35e86 100644 --- a/hack/make/.integration-daemon-start +++ b/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