Skip to content

Commit

Permalink
MDBF-847 Add centos stream 10 as bb worker
Browse files Browse the repository at this point in the history
Bump java version.

It wasn't clear that setup python was a problem.

asio (used in galera) isn't currently in EPEL 10
https://src.fedoraproject.org/rpms/asio
  • Loading branch information
grooverdan committed Dec 4, 2024
1 parent 050c1bb commit 17b0066
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build-centos.pip-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ jobs:
matrix:
include:

- image: quay.io/centos/centos:stream10
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
tag: centosstream10
runner: ubuntu-24.04
nogalera: true

- image: quay.io/centos/centos:stream9
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
tag: centosstream9
Expand Down
16 changes: 12 additions & 4 deletions ci_build_images/centos.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ RUN dnf -y install 'dnf-command(config-manager)' \
&& source /etc/os-release \
&& ARCH=$(rpm --query --queryformat='%{ARCH}' rpm) \
&& case "$PLATFORM_ID" in \
"platform:el10") \
;& \
"platform:el9") \
# centosstream9/almalinux9/rockylinux9 \
dnf -y install epel-release; \
Expand Down Expand Up @@ -59,7 +61,6 @@ RUN dnf -y install 'dnf-command(config-manager)' \
# not sure if needed \
# perl \
${extra} \
asio-devel \
bzip2 \
bzip2-devel \
ccache \
Expand All @@ -70,9 +71,6 @@ RUN dnf -y install 'dnf-command(config-manager)' \
eigen3-devel \
flex \
galera-4 \
java-1.8.0-openjdk-devel \
java-1.8.0-openjdk \
jemalloc-devel \
libcurl-devel \
libevent-devel \
libffi-devel \
Expand All @@ -91,6 +89,16 @@ RUN dnf -y install 'dnf-command(config-manager)' \
wget \
which \
xz-devel \
&& if [ "$PLATFORM_ID" = "platform:el10" ]; then \
dnf -y install liburing-devel \
java-21-openjdk-devel \
java-21-openjdk ; \
else \
dnf -y install asio-devel \
java-1.8.0-openjdk-devel \
java-1.8.0-openjdk \
jemalloc-devel; \
fi \
&& if [ "$ID" != "openeuler" ]; then dnf -y install yum-utils; fi \
&& if [ "$(uname -m)" = "x86_64" ]; then dnf -y install libpmem-devel; fi \
&& dnf clean all \
Expand Down
3 changes: 3 additions & 0 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,20 @@
supportedPlatforms["10.10"] += supportedPlatforms["10.9"]

supportedPlatforms["10.11"] = [
"aarch64-centos-stream10",
"aarch64-debian-12",
"aarch64-fedora-40",
"aarch64-fedora-41",
"aarch64-ubuntu-2404",
"amd64-centos-stream10",
"amd64-debian-12",
"amd64-debian-12-debug-embedded",
"amd64-fedora-40",
"amd64-fedora-41",
"amd64-opensuse-1506",
"amd64-sles-1506",
"amd64-ubuntu-2404",
"ppc64le-centos-stream10",
"ppc64le-ubuntu-2404",
"s390x-sles-1506",
"s390x-ubuntu-2404",
Expand Down
7 changes: 7 additions & 0 deletions os_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ centos-stream9:
- aarch64
- ppc64le
type: rpm
centos-stream10:
version_name: 10
arch:
- amd64
- aarch64
- ppc64le
type: rpm
debian-11:
version_name: bullseye
arch:
Expand Down

0 comments on commit 17b0066

Please sign in to comment.