Skip to content

Commit de524f4

Browse files
committed
MDBF-1157: Add SLES 16.0 as BB release builder
SLES 16.0 and 15 SP7 have a few version/packaging differences. Both versions supported Python 3.13 so just used that. Notably SLES 16.0 doesn't have: * jemalloc-devel - we didn't appear to be using it. Upstream EOLed it so any residual use (ColumnStore?) will need to adjust. * rpmlint - we never got a CI that used it. * subversion - unclear why it was in original build, but its not there now.
1 parent fc20a1c commit de524f4

File tree

3 files changed

+35
-18
lines changed

3 files changed

+35
-18
lines changed

.github/workflows/build-sles.pip-based.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ jobs:
3636
tag: sles1507
3737
nogalera: false
3838

39+
- image: registry.suse.com/bci/bci-base:16.0
40+
platforms: linux/amd64, linux/s390x
41+
tag: sles1600
42+
nogalera: true
43+
3944
uses: ./.github/workflows/bbw_build_container_template.yml
4045
with:
4146
dockerfile: sles.Dockerfile pip.Dockerfile

ci_build_images/sles.Dockerfile

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,16 @@ COPY --chmod=755 mariadb_zypper_expect /
1313
RUN zypper -n update \
1414
&& zypper -n install -t pattern devel_basis \
1515
&& . /etc/os-release \
16-
&& VERSION_ID=${VERSION_ID%%.*} \
16+
&& if [ "$VERSION_ID" = "15.7" ]; then \
17+
BOOST_VER=1_66_0; \
18+
FMT_VER=8; \
19+
LIBURING_VER=2; \
20+
else \
21+
BOOST_VER=1_86_0; \
22+
FMT_VER=11; \
23+
LIBURING_VER=; \
24+
fi \
25+
&& VERSION_ID="${VERSION_ID%%.*}" \
1726
&& ARCH=$(rpm --query --queryformat='%{ARCH}' zypper) \
1827
&& if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \
1928
&& zypper addrepo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}-${ID%%leap}-${VERSION_ID}".repo \
@@ -26,39 +35,35 @@ RUN zypper -n update \
2635
cracklib-devel \
2736
createrepo_c \
2837
expect \
29-
galera-4 \
3038
gcc-c++ \
3139
gdb \
3240
git \
3341
glibc-locale \
34-
jemalloc-devel \
3542
libaio-devel \
36-
libboost_atomic1_66_0-devel \
37-
libboost_chrono1_66_0-devel \
38-
libboost_date_time1_66_0-devel \
39-
libboost_filesystem1_66_0-devel \
40-
libboost_program_options1_66_0-devel \
41-
libboost_regex1_66_0-devel \
42-
libboost_system1_66_0-devel \
43-
libboost_thread1_66_0-devel \
43+
libboost_atomic"${BOOST_VER}"-devel \
44+
libboost_chrono"${BOOST_VER}"-devel \
45+
libboost_date_time"${BOOST_VER}"-devel \
46+
libboost_filesystem"${BOOST_VER}"-devel \
47+
libboost_program_options"${BOOST_VER}"-devel \
48+
libboost_regex"${BOOST_VER}"-devel \
49+
libboost_system"${BOOST_VER}"-devel \
50+
libboost_thread"${BOOST_VER}"-devel \
4451
libcurl-devel \
4552
libffi-devel \
46-
libfmt8 \
53+
libfmt"${FMT_VER}" \
4754
libgnutls-devel \
4855
liblz4-devel \
4956
libopenssl-3-devel \
50-
liburing2-devel \
57+
liburing"${LIBURING_VER}"-devel \
5158
libxml2-devel \
5259
pam-devel \
5360
pcre2-devel \
5461
perl-Net-SSLeay \
5562
policycoreutils \
56-
python311-devel \
57-
python311-pip \
63+
python313-devel \
64+
python313-pip \
5865
rpm-build \
59-
rpmlint \
6066
snappy-devel \
61-
subversion \
6267
systemd-devel \
6368
wget \
6469
# Using OSS repository only for judy-devel as a build-time dependency.
@@ -76,4 +81,3 @@ RUN zypper -n update \
7681
&& curl -sLo /usr/local/bin/dumb-init "https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m)" \
7782
&& chmod +x /usr/local/bin/dumb-init
7883

79-
ENV WSREP_PROVIDER=/usr/lib64/galera-4/libgalera_smm.so

os_info.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,14 @@ sles-1507:
189189
- amd64
190190
- s390x
191191
type: rpm
192+
sles-1600:
193+
image_tag: sles1500
194+
tags:
195+
- release_packages
196+
arch:
197+
- amd64
198+
- s390x
199+
type: rpm
192200
ubuntu-2204:
193201
image_tag: ubuntu22.04
194202
tags:

0 commit comments

Comments
 (0)