1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00

Turn off unittests for libcpp, add server 11.4 for rockylinux:9 and ubuntu 24.04

This commit is contained in:
Leonid Fedorov
2025-07-31 20:47:55 +00:00
parent 7b660fa860
commit 6fd33958a6
4 changed files with 68 additions and 44 deletions

View File

@@ -7,6 +7,11 @@ local servers = {
[current_branch]: ["10.6-enterprise"], [current_branch]: ["10.6-enterprise"],
}; };
local extra_servers = {
[current_branch]: ["11.4-enterprise"],
};
local platforms = { local platforms = {
[current_branch]: ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:22.04", "ubuntu:24.04"], [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) = local customBootstrapParamsForExisitingPipelines(envkey) =
# errorprone if we pass --custom-cmake-flags twice, the last one will win # errorprone if we pass --custom-cmake-flags twice, the last one will win
local customBootstrapMap = { 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)) (if (std.objectHas(customBootstrapMap, envkey))
then customBootstrapMap[envkey] else ""); then customBootstrapMap[envkey] else "");
@@ -311,7 +316,9 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
' --container-name ' + getContainerName("mtr") + ' --container-name ' + getContainerName("mtr") +
' --distro ' + platform + ' --distro ' + platform +
' --suite-list $${MTR_SUITE_LIST}' + ' --suite-list $${MTR_SUITE_LIST}' +
' --triggering-event ' + event, ' --triggering-event ' + event +
' --full-mtr ',
], ],
[if (std.member(ignoreFailureStepList, "mtr")) then "failure"]: "ignore", [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 = [ local AllPipelines =
Pipeline(b, p, e, a, s) // [
for b in std.objectFields(platforms) // Pipeline(b, platform, triggeringEvent, a, server, flag, "")
for p in platforms[b] // for a in ["amd64"]
for s in servers[b] // for b in std.objectFields(platforms)
for e in events // for platform in ["rockylinux:8"]
for a in archs // for flag in ["gcc-toolset"]
] + // for triggeringEvent in events
[ // for server in servers[current_branch]
Pipeline(any_branch, p, "custom", a, server) // ] +
for p in platforms[current_branch] // [
for server in servers[current_branch] // Pipeline(b, p, e, a, s)
for a in archs // 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) Pipeline(b, platform, triggeringEvent, a, server, "", buildenv)
for a in ["amd64"] for a in ["amd64"]
@@ -659,6 +677,15 @@ local AllPipelines = [
for server in servers[current_branch] for server in servers[current_branch]
] + ] +
// last argument is to ignore mtr and regression failures // 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"]) Pipeline(b, platform, triggeringEvent, a, server, flag, envcommand, ["regression", "mtr"])
for a in ["amd64"] for a in ["amd64"]
@@ -669,25 +696,19 @@ local AllPipelines = [
for triggeringEvent in events for triggeringEvent in events
for server in servers[current_branch] for server in servers[current_branch]
] + ] +
// last argument is to ignore mtr and regression failures // // last argument is to ignore mtr and regression failures
[ // [
Pipeline(b, platform, triggeringEvent, a, server, flag, "", ["regression", "mtr"]) // Pipeline(b, platform, triggeringEvent, a, server, flag, "", ["regression", "mtr"])
for a in ["amd64"] // for a in ["amd64"]
for b in std.objectFields(platforms) // for b in std.objectFields(platforms)
for platform in ["ubuntu:24.04"] // for platform in ["ubuntu:24.04"]
for flag in ["ASan", "UBSan"] // for flag in ["ASan", "UBSan"]
for triggeringEvent in events // for triggeringEvent in events
for server in servers[current_branch] // 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]
];
local FinalPipeline(branch, event) = { local FinalPipeline(branch, event) = {
kind: "pipeline", kind: "pipeline",

View File

@@ -366,6 +366,7 @@ construct_cmake_flags() {
message "Columnstore maintainer mode on" message "Columnstore maintainer mode on"
else else
MDB_CMAKE_FLAGS+=(-DCOLUMNSTORE_MAINTAINER=NO) MDB_CMAKE_FLAGS+=(-DCOLUMNSTORE_MAINTAINER=NO)
MDB_CMAKE_FLAGS+=(-DMYSQL_MAINTAINER_MODE=NO)
warn "Maintainer mode is disabled, be careful, alien" warn "Maintainer mode is disabled, be careful, alien"
fi fi

View File

@@ -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=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=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=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=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 optparse.define short=f long=full-mtr desc="Run Full Mtr" variable=FULL_MTR default=false value=true
source $(optparse.build) source $(optparse.build)
@@ -31,12 +31,12 @@ if [[ "$EUID" -ne 0 ]]; then
exit 1 exit 1
fi fi
for flag in CONTAINER_NAME DISTRO EVENT MTR_SUITE_LIST; do # for flag in CONTAINER_NAME DISTRO EVENT MTR_SUITE_LIST; do
if [[ -z "${!flag}" ]]; then # if [[ -z "${!flag}" ]]; then
error "Missing required flag: -${flag:0:1} / --${flag,,}" # error "Missing required flag: -${flag:0:1} / --${flag,,}"
exit 1 # exit 1
fi # fi
done # done
if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then
error "Container '${CONTAINER_NAME}' is not running." error "Container '${CONTAINER_NAME}' is not running."

View File

@@ -8,6 +8,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#define _LIBCPP_DEBUG 1
#include "rewrites.h" #include "rewrites.h"
#include <cstdint> #include <cstdint>
#include <typeinfo> #include <typeinfo>