Skip to content

Commit 20046a3

Browse files
Add amd64-almalinux-8-bintar builder
- should run on currently idle hz-bbw7. bbw5 is sometimes unstable (OOM) - switch centos-7 bintar to run on hz-bbw7, for the same reason as above CMAKE: - introduce %(kw:additional_args)s - centos7 bintar still needs -DCURSES_NEED_NCURSES=1 flag because curses -> ncurses symlink is missing on the image. That's not the case for almalinux-8-bintar - already released packages have galera shared library included. The library is already present in the almalinux-8-bintar container image so include it as extra files for CPACK Build-deps - eigen is not needed as per CVICENTIU comment - add LZO to fix CMAKE reporting it as not found.
1 parent a781f3e commit 20046a3

File tree

4 files changed

+30
-3
lines changed

4 files changed

+30
-3
lines changed

ci_build_images/bintar.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ RUN dnf -y install 'dnf-command(config-manager)' \
3232
cracklib-devel \
3333
createrepo \
3434
curl-devel \
35-
eigen3-devel \
3635
flex \
3736
galera-4 \
3837
java-1.8.0-openjdk-devel \
@@ -44,6 +43,7 @@ RUN dnf -y install 'dnf-command(config-manager)' \
4443
libpmem-devel \
4544
libxml2-devel \
4645
libzstd-devel \
46+
lzo-devel \
4747
perl-autodie \
4848
perl-Net-SSLeay \
4949
python3-devel \

constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
SUPPORTED_PLATFORMS["11.5"].remove("amd64-centos-7-bintar")
192192
SUPPORTED_PLATFORMS["11.6"] = SUPPORTED_PLATFORMS["11.5"].copy()
193193
SUPPORTED_PLATFORMS["11.7"] = SUPPORTED_PLATFORMS["11.6"].copy()
194+
SUPPORTED_PLATFORMS["11.7"] += ["amd64-almalinux-8-bintar"]
194195
SUPPORTED_PLATFORMS["11.8"] = SUPPORTED_PLATFORMS["11.7"].copy()
195196
SUPPORTED_PLATFORMS["main"] = SUPPORTED_PLATFORMS["11.8"].copy()
196197

master-docker-nonstandard/master.cfg

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,24 @@ addWorker(
397397

398398
addWorker(
399399
"hz-bbw",
400-
5,
400+
7,
401401
"-centos-7-bintar",
402402
os.environ["CONTAINER_REGISTRY_URL"]
403403
+ "centos7-bintar",
404404
jobs=10,
405405
save_packages=True,
406406
)
407407

408+
addWorker(
409+
"hz-bbw",
410+
7,
411+
"-almalinux-8-bintar",
412+
os.environ["CONTAINER_REGISTRY_URL"]
413+
+ "almalinux8-bintar",
414+
jobs=10,
415+
save_packages=True,
416+
)
417+
408418
addWorker(
409419
"s390x-bbw",
410420
1,
@@ -1340,12 +1350,12 @@ f_bintar.addStep(
13401350
util.Interpolate(
13411351
"""cmake . \\
13421352
-DWITH_READLINE=1 \\
1343-
-DCURSES_NEED_NCURSES=1 \\
13441353
-DBUILD_CONFIG=mysql_release \\
13451354
-DCMAKE_C_COMPILER_LAUNCHER=ccache \\
13461355
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \\
13471356
-DWITH_SSL=bundled \\
13481357
-DPLATFORM=linux-systemd \\
1358+
%(kw:additional_args)s \\
13491359
&& make -j%(kw:jobs)s package""",
13501360
perf_schema=util.Property("perf_schema", default="YES"),
13511361
build_type=util.Property("build_type", default="RelWithDebInfo"),
@@ -1654,6 +1664,21 @@ c["builders"].append(
16541664
nextBuild=nextBuild,
16551665
canStartBuild=canStartBuild,
16561666
locks=getLocks,
1667+
properties={"additional_args": "-DCURSES_NEED_NCURSES=1"},
1668+
factory=f_bintar,
1669+
)
1670+
)
1671+
1672+
c["builders"].append(
1673+
util.BuilderConfig(
1674+
name="amd64-almalinux-8-bintar",
1675+
workernames=workers["x64-bbw-docker-almalinux-8-bintar"],
1676+
tags=["AlmaLinux", "quick", "bintar"],
1677+
collapseRequests=True,
1678+
nextBuild=nextBuild,
1679+
canStartBuild=canStartBuild,
1680+
locks=getLocks,
1681+
properties={"additional_args": '-DEXTRA_FILES="${WSREP_PROVIDER}=lib;${WSREP_PROVIDER}=lib/galera;"'},
16571682
factory=f_bintar,
16581683
)
16591684
)

master-private.cfg-sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ private["docker_workers"]= {
6767
"hz-bbw4-docker":"tcp://IP_address:port",
6868
"hz-bbw5-docker":"tcp://IP_address:port",
6969
"hz-bbw6-docker":"tcp://IP_address:port",
70+
"hz-bbw7-docker":"tcp://IP_address:port",
7071
"gsk-bbw1-docker":"tcp://IP_address:port",
7172
"bm-bbw1-docker":"tcp://IP_address:port",
7273
"ppc64le-db-bbw1-docker":"tcp://IP_address:port",

0 commit comments

Comments
 (0)