Skip to content

Commit

Permalink
Upgrade asan builder
Browse files Browse the repository at this point in the history
Upgrade asan to Ubuntu 22.04 and clang-14 since Ubuntu 18.04 is EOL.
  • Loading branch information
vladbogo committed Sep 1, 2023
1 parent ac59f72 commit 315d989
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
5 changes: 4 additions & 1 deletion ci_build_images/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ RUN . /etc/os-release; \
&& if [ "$(getconf LONG_BIT)" = 64 ]; then \
apt-get -y install --no-install-recommends galera-4; \
fi \
&& if ! grep -q 'bionic' /etc/apt/sources.list; then \
&& if [ "${VERSION_CODENAME}" != bionic ]; then \
apt-get -y install --no-install-recommends flex; \
fi \
&& if [ "${VERSION_CODENAME}" = jammy ]; then \
apt-get -y install --no-install-recommends clang-14; \
fi \
&& apt-get clean

ENV WSREP_PROVIDER=/usr/lib/galera/libgalera_smm.so
10 changes: 5 additions & 5 deletions master-docker-nonstandard/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ for w_name in ['ns-x64-bbw']:
for i in range(1,end_range):
jobs = 7
addWorker(w_name, i, '-aocc-debian-11', "quay.io/mariadb-foundation/bb-worker:debian11-aocc", jobs=jobs, save_packages=False)
addWorker(w_name, i, '-clang-ubuntu-1804', "quay.io/mariadb-foundation/bb-worker:ubuntu18.04-clang", jobs=jobs, save_packages=False)
addWorker(w_name, i, '-asan-ubuntu-2204', "quay.io/mariadb-foundation/bb-worker:ubuntu22.04", jobs=jobs, save_packages=False)
addWorker(w_name, i, '-icc-ubuntu-1804', "quay.io/mariadb-foundation/bb-worker:ubuntu18.04-icc", jobs=jobs, save_packages=False)
addWorker(w_name, i, '-ubuntu-2004', "quay.io/mariadb-foundation/bb-worker:ubuntu20.04", jobs=jobs, save_packages=True)

Expand Down Expand Up @@ -243,7 +243,7 @@ f_asan_build.addStep(steps.ShellCommand(name="create html log file", command=['b
f_asan_build.addStep(steps.ShellCommand(command='echo "leak:libtasn1\nleak:libgnutls\nleak:libgmp" > mysql-test/lsan.supp', doStepIf=filterBranch))
f_asan_build.addStep(steps.ShellCommand(command='cat mysql-test/lsan.supp', doStepIf=filterBranch))
f_asan_build.addStep(steps.Compile(command=
["sh", "-c", util.Interpolate('cmake . -DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-O2 -msse4.2 -Wno-unused-command-line-argument -fdebug-macro -Wno-inconsistent-missing-override" -DCMAKE_CXX_FLAGS="-O2 -msse4.2 -Wno-unused-command-line-argument -fdebug-macro -Wno-inconsistent-missing-override" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=YES -DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_CONNECT=NO -DWITH_SAFEMALLOC=OFF -DWITH_ZLIB=bundled -DWITH_SSL=bundled -DWITH_PCRE=system -DWITH_DBUG_TRACE=OFF -DWITH_SAFEMALLOC=OFF && make VERBOSE=1 -j%(kw:jobs)s package', jobs=util.Property('jobs', default='$(getconf _NPROCESSORS_ONLN)'))], haltOnFailure="true"))
["sh", "-c", util.Interpolate('cmake . -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++14 -DCMAKE_C_FLAGS="-O2 -msse4.2 -Wno-unused-command-line-argument -fdebug-macro -Wno-inconsistent-missing-override" -DCMAKE_CXX_FLAGS="-O2 -msse4.2 -Wno-unused-command-line-argument -fdebug-macro -Wno-inconsistent-missing-override" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=YES -DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_CONNECT=NO -DWITH_SAFEMALLOC=OFF -DWITH_ZLIB=bundled -DWITH_SSL=bundled -DWITH_PCRE=system -DWITH_DBUG_TRACE=OFF -DWITH_SAFEMALLOC=OFF && make VERBOSE=1 -j%(kw:jobs)s package', jobs=util.Property('jobs', default='$(getconf _NPROCESSORS_ONLN)'))], haltOnFailure="true"))
f_asan_build.addStep(steps.MTR(
logfiles={"mysqld*": "/buildbot/mysql_logs.html", "syslog": "/var/log/syslog"},
command=["sh", "-c", util.Interpolate('cd mysql-test && MTR_FEEDBACK_PLUGIN=1 ASAN_OPTIONS="abort_on_error=1" LSAN_OPTIONS="print_suppressions=0,suppressions=`pwd`/lsan.supp" perl mysql-test-run.pl --verbose-restart --force --retry=3 --max-save-core=1 --max-save-datadir=1 --max-test-fail=20 --mem --parallel=$(expr %(kw:jobs)s \* 2)', jobs=util.Property('jobs', default='$(getconf _NPROCESSORS_ONLN)'))],
Expand Down Expand Up @@ -673,9 +673,9 @@ c['builders'].append(
factory=f_without_server))

c['builders'].append(
util.BuilderConfig(name="amd64-ubuntu-1804-clang10-asan",
workernames=workers["ns-x64-bbw-docker-clang-ubuntu-1804"],
tags=["Ubuntu", "quick", "clang-10", "asan"],
util.BuilderConfig(name="amd64-ubuntu-2204-clang14-asan",
workernames=workers["ns-x64-bbw-docker-asan-ubuntu-2204"],
tags=["Ubuntu", "quick", "clang-14", "asan"],
collapseRequests=True,
nextBuild=nextBuild,
canStartBuild=canStartBuild,
Expand Down

0 comments on commit 315d989

Please sign in to comment.