From b57241ddbb60cd5e7250caa252fb6004e2e30783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 14 Oct 2022 15:01:19 +0200 Subject: [PATCH] Allow system tests to run under root user when inside CI https://docs.gitlab.com/ee/ci/variables/predefined_variables.html says variable CI_SERVER="yes" is available in all versions of Gitlab. (cherry picked from commit ddf46056ca6afa6352c360be4a0d7e336f2b6fd1) Adapted to v9_16's version of run.sh. --- bin/tests/system/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh index 14a10670fa..650ae7f974 100755 --- a/bin/tests/system/run.sh +++ b/bin/tests/system/run.sh @@ -18,7 +18,7 @@ SYSTEMTESTTOP="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" . $SYSTEMTESTTOP/conf.sh -if [ "$(id -u)" -eq "0" ] && ! ${NAMED} -V | grep -q -F -- "enable-developer"; then +if [ "$CI_SERVER" != "yes" ] && [ "$(id -u)" -eq "0" ] && ! ${NAMED} -V | grep -q -F -- "enable-developer"; then echofail "Refusing to run test as root. Build with --enable-developer to override." >&2 exit 1 fi