From 4f4556941cb8a6cf608efa85637c776c4eadbd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Thu, 13 Oct 2022 17:49:36 +0200 Subject: [PATCH 1/2] Build gcc:oraclelinux9:amd64 CI jobs with --disable-developer Purpose of this is to guard against tests which rely on querytrace or other optional features enabled by --enable-developer switch. (cherry picked from commit d6db5c53355b606588e69861d37c72a580c612ca) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f114ff7399..7f92231829 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -637,7 +637,7 @@ gcc:oraclelinux9:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--with-libidn2" + EXTRA_CONFIGURE: "--with-libidn2 --disable-developer" <<: *oraclelinux_9_amd64_image <<: *build_job From 9a132f9e2b63a677ec41d0b8341b36a742a845fd 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 2/2] 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) --- bin/tests/system/run.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in index 37e560304a..ce469cc270 100644 --- a/bin/tests/system/run.sh.in +++ b/bin/tests/system/run.sh.in @@ -22,7 +22,7 @@ srcdir=@abs_srcdir@ # shellcheck source=conf.sh . ${builddir}/conf.sh -if [ "$(id -u)" -eq "0" ] && [ "@DEVELOPER_MODE@" != "yes" ]; then +if [ "$CI_SERVER" != "yes" ] && [ "$(id -u)" -eq "0" ] && [ "@DEVELOPER_MODE@" != "yes" ]; then echofail "Refusing to run test as root. Build with --enable-developer to override." >&2 exit 1 fi