From 6fd33958a696b53824fd52160dcf235ea3920eec Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Thu, 31 Jul 2025 20:47:55 +0000 Subject: [PATCH] Turn off unittests for libcpp, add server 11.4 for rockylinux:9 and ubuntu 24.04 --- .drone.jsonnet | 93 +++++++++++++++++++++++-------------- build/bootstrap_mcs.sh | 1 + build/run_mtr.sh | 16 +++---- dbcon/execplan/rewrites.cpp | 2 + 4 files changed, 68 insertions(+), 44 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index fa6546d50..1268f8bd7 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -7,6 +7,11 @@ local servers = { [current_branch]: ["10.6-enterprise"], }; +local extra_servers = { + [current_branch]: ["11.4-enterprise"], +}; + + local platforms = { [current_branch]: ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:22.04", "ubuntu:24.04"], }; @@ -38,7 +43,7 @@ local customEnvCommands(envkey, builddir) = local customBootstrapParamsForExisitingPipelines(envkey) = # errorprone if we pass --custom-cmake-flags twice, the last one will win local customBootstrapMap = { - "ubuntu:24.04": "--custom-cmake-flags '-DCOLUMNSTORE_ASAN_FOR_UNITTESTS=YES'", + //"ubuntu:24.04": "--custom-cmake-flags '-DCOLUMNSTORE_ASAN_FOR_UNITTESTS=YES'", }; (if (std.objectHas(customBootstrapMap, envkey)) then customBootstrapMap[envkey] else ""); @@ -308,10 +313,12 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise", 'apk add bash &&' + get_build_command("run_mtr.sh") + - ' --container-name ' + getContainerName("mtr") + + ' --container-name ' + getContainerName("mtr") + ' --distro ' + platform + ' --suite-list $${MTR_SUITE_LIST}' + - ' --triggering-event ' + event, + ' --triggering-event ' + event + + ' --full-mtr ', + ], [if (std.member(ignoreFailureStepList, "mtr")) then "failure"]: "ignore", @@ -635,20 +642,31 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise", }; -local AllPipelines = [ - Pipeline(b, p, e, a, s) - for b in std.objectFields(platforms) - for p in platforms[b] - for s in servers[b] - for e in events - for a in archs -] + -[ - Pipeline(any_branch, p, "custom", a, server) - for p in platforms[current_branch] - for server in servers[current_branch] - for a in archs -] + +local AllPipelines = +// [ +// Pipeline(b, platform, triggeringEvent, a, server, flag, "") +// for a in ["amd64"] +// for b in std.objectFields(platforms) +// for platform in ["rockylinux:8"] +// for flag in ["gcc-toolset"] +// for triggeringEvent in events +// for server in servers[current_branch] +// ] + +// [ +// Pipeline(b, p, e, a, s) +// for b in std.objectFields(platforms) +// for p in platforms[b] +// for s in servers[b] +// for e in events +// for a in archs +// ] + +// [ +// Pipeline(any_branch, p, "custom", a, server) +// for p in platforms[current_branch] +// for server in servers[current_branch] +// for a in archs +// ] + +// clang [ Pipeline(b, platform, triggeringEvent, a, server, "", buildenv) for a in ["amd64"] @@ -659,6 +677,15 @@ local AllPipelines = [ for server in servers[current_branch] ] + // last argument is to ignore mtr and regression failures +[ + Pipeline(b, platform, triggeringEvent, a, server, "", "", ["regression", "mtr"]) + for a in ["amd64"] + for b in std.objectFields(platforms) + for platform in ["ubuntu:24.04", "rockylinux:9"] + for triggeringEvent in events + for server in extra_servers[current_branch] +] + +// // last argument is to ignore mtr and regression failures [ Pipeline(b, platform, triggeringEvent, a, server, flag, envcommand, ["regression", "mtr"]) for a in ["amd64"] @@ -669,25 +696,19 @@ local AllPipelines = [ for triggeringEvent in events for server in servers[current_branch] ] + -// last argument is to ignore mtr and regression failures -[ - Pipeline(b, platform, triggeringEvent, a, server, flag, "", ["regression", "mtr"]) - for a in ["amd64"] - for b in std.objectFields(platforms) - for platform in ["ubuntu:24.04"] - for flag in ["ASan", "UBSan"] - for triggeringEvent in events - for server in servers[current_branch] -] + -[ - Pipeline(b, platform, triggeringEvent, a, server, flag, "") - for a in ["amd64"] - for b in std.objectFields(platforms) - for platform in ["rockylinux:8"] - for flag in ["gcc-toolset"] - for triggeringEvent in events - for server in servers[current_branch] -]; +// // last argument is to ignore mtr and regression failures +// [ +// Pipeline(b, platform, triggeringEvent, a, server, flag, "", ["regression", "mtr"]) +// for a in ["amd64"] +// for b in std.objectFields(platforms) +// for platform in ["ubuntu:24.04"] +// for flag in ["ASan", "UBSan"] +// for triggeringEvent in events +// for server in servers[current_branch] +// ] + + +[]; + local FinalPipeline(branch, event) = { kind: "pipeline", diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh index 6f9e33292..5ca7eacb1 100755 --- a/build/bootstrap_mcs.sh +++ b/build/bootstrap_mcs.sh @@ -366,6 +366,7 @@ construct_cmake_flags() { message "Columnstore maintainer mode on" else MDB_CMAKE_FLAGS+=(-DCOLUMNSTORE_MAINTAINER=NO) + MDB_CMAKE_FLAGS+=(-DMYSQL_MAINTAINER_MODE=NO) warn "Maintainer mode is disabled, be careful, alien" fi diff --git a/build/run_mtr.sh b/build/run_mtr.sh index 685d10d69..ce0c425a2 100755 --- a/build/run_mtr.sh +++ b/build/run_mtr.sh @@ -9,8 +9,8 @@ optparse.define short=c long=container-name desc="Name of the Docker container w optparse.define short=d long=distro desc="Linux distro for which mtr is runned" variable=DISTRO optparse.define short=s long=suite-list desc="Comma-separated list of test suites to run" variable=MTR_SUITE_LIST optparse.define short=e long=triggering-event desc="Event that triggers testrun" variable=EVENT -optparse.define short=D long=download-data desc="Download and extract data from S3 for extended MTR" variable=DOWNLOAD_DATA default false value true -optparse.define short=F long=full-mtr desc="Run Full Mtr" variable=FULL_MTR default false value true +optparse.define short=x long=download-data desc="Download and extract data from S3 for extended MTR" variable=DOWNLOAD_DATA default=false value=true +optparse.define short=f long=full-mtr desc="Run Full Mtr" variable=FULL_MTR default=false value=true source $(optparse.build) @@ -31,12 +31,12 @@ if [[ "$EUID" -ne 0 ]]; then exit 1 fi -for flag in CONTAINER_NAME DISTRO EVENT MTR_SUITE_LIST; do - if [[ -z "${!flag}" ]]; then - error "Missing required flag: -${flag:0:1} / --${flag,,}" - exit 1 - fi -done +# for flag in CONTAINER_NAME DISTRO EVENT MTR_SUITE_LIST; do +# if [[ -z "${!flag}" ]]; then +# error "Missing required flag: -${flag:0:1} / --${flag,,}" +# exit 1 +# fi +# done if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then error "Container '${CONTAINER_NAME}' is not running." diff --git a/dbcon/execplan/rewrites.cpp b/dbcon/execplan/rewrites.cpp index a7518bbd3..672f5b21e 100644 --- a/dbcon/execplan/rewrites.cpp +++ b/dbcon/execplan/rewrites.cpp @@ -8,6 +8,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#define _LIBCPP_DEBUG 1 + #include "rewrites.h" #include #include