Merge branch 'dev'

.github/workflows/bbm_build_container.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: build
     services:
       registry:

.github/workflows/bbm_deploy.yml

@@ -2,6 +2,7 @@
 name: bbm-deploy
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - ".github/workflows/bbm_deploy.yml"
@@ -10,6 +11,7 @@ on:
       - "common_factories.py"
       - "constants.py"
       - "docker-compose/**"
+      - "dockerfiles/**"
       - "locks.py"
       - "master-**"
       - "master.cfg"
@@ -25,6 +27,7 @@ on:
       - "common_factories.py"
       - "constants.py"
       - "docker-compose/**"
+      - "dockerfiles/**"
       - "locks.py"
       - "master-**"
       - "master.cfg"
@@ -35,7 +38,7 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Check master.cfg files
@@ -46,7 +49,7 @@ jobs:
           python get_ssh_cnx_num.py
 
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: check
     if: >
       github.ref == 'refs/heads/dev' &&

.github/workflows/bbw_build_container.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner || 'ubuntu-22.04' }}
     services:
       registry:
         image: registry:2
@@ -95,16 +95,21 @@ jobs:
           - dockerfile: fedora.Dockerfile
             image: fedora:40
             platforms: linux/amd64, linux/arm64/v8
+          - dockerfile: fedora.Dockerfile
+            image: fedora:40
+            tag: fedora40-valgrind
+            platforms: linux/amd64
+            install_valigrind: "true"
           - dockerfile: centos7.Dockerfile pip.Dockerfile
             image: centos:7
             platforms: linux/amd64
           - dockerfile: centos.Dockerfile pip.Dockerfile
             image: quay.io/centos/centos:stream9
             tag: centosstream9
+            runner: ubuntu-24.04
             platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
-            # //TEMP Error: Unable to find a match: ccache python3-scons (on
-            # s390x)
-            # platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
+            # //TEMP chicken/egg problem - could add s390x
+            # but that would need a galera-4 build from on this image
           - dockerfile: opensuse.Dockerfile pip.Dockerfile
             image: opensuse/leap:15.6
             tag: opensuse15
@@ -119,11 +124,11 @@ jobs:
           - dockerfile: centos.Dockerfile pip.Dockerfile
             image: rockylinux:9
             platforms: linux/amd64, linux/arm64/v8
-          - dockerfile: debian.Dockerfile jepsen-mysql.Dockerfile
+          - dockerfile: debian.Dockerfile jepsen-mariadb.Dockerfile
             image: ubuntu:22.04
             branch: 10.11
             platforms: linux/amd64
-            tag: ubuntu22.04-jepsen-mysql
+            tag: ubuntu22.04-jepsen-mariadb
     env:
       BUILD_RHEL: false
       DEPLOY_IMAGES: false
@@ -166,12 +171,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y qemu-user-static
-      - name: Make sure that time is in sync
-        run: |
-          # RHEL subscription needs that time and date
-          # is correct and is syncing with an NTP-server
-          # https://access.redhat.com/discussions/672313#comment-2360508
-          sudo chronyc -a makestep
       - name: Build image
         run: |
           podman manifest create ${{ env.REPO }}:${{ env.IMG }}
@@ -185,7 +184,8 @@ jobs:
               -f $GITHUB_WORKSPACE/Dockerfile \
               --build-arg BASE_IMAGE=${{ matrix.image }} \
               --build-arg CLANG_VERSION=${{ matrix.clang_version }} \
-              --build-arg MARIADB_BRANCH=${{ matrix.branch }}
+              --build-arg MARIADB_BRANCH=${{ matrix.branch }} \
+              --build-arg INSTALL_VALGRIND="${{ matrix.install_valigrind }}"
           done
           podman images
       - name: Push images to local registry

.github/workflows/bbw_build_container_release.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     services:
       registry:
         image: registry:2

.github/workflows/bbw_build_container_rhel.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     services:
       registry:
         image: registry:2

.github/workflows/eco_containers.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: ${{ matrix.tag }}
     strategy:
       fail-fast: false

.github/workflows/pre-commit.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       #//TEMP we need to check only modified files WRT main

Makefile

@@ -27,7 +27,6 @@ venv: ## Create python3 venv if it does not exists
 
 install-pip-packages: ## Install python3 requirements
 	$(info --> Install requirements via `pip`)
-	uv pip install wheel
 	uv pip install -r requirements.txt
 
 install-vlad-bb-fork: ## Install vlad bb fork

ci_build_images/centos.Dockerfile

@@ -11,6 +11,7 @@ LABEL maintainer="MariaDB Buildbot maintainers"
 # hadolint ignore=SC2086
 RUN dnf -y install 'dnf-command(config-manager)' \
     && source /etc/os-release \
+    && ARCH=$(rpm --query --queryformat='%{ARCH}' rpm) \
     && case "$PLATFORM_ID" in \
         "platform:el9") \
           # centosstream9/almalinux9/rockylinux9 \
@@ -25,6 +26,23 @@ RUN dnf -y install 'dnf-command(config-manager)' \
           extra="buildbot-worker"; \
           ;; \
     esac \
+    && case "$ID" in \
+        "centos") \
+          ID=centos-stream; \
+          ;; \
+        "rocky") \
+          ID=rockylinux; \
+          ;& \
+        "almalinux") \
+          if [ "$ARCH" == "aarch64" ]; then ID=rhel; fi ; \
+          ;& \
+        *) \
+          # VERSION_ID has leading -, except on centos-stream
+          VERSION_ID=-${VERSION_ID}; \
+    esac \
+    && VERSION_ID=${VERSION_ID%%.*} \
+    && if [ $ARCH = x86_64 ]; then ARCH=amd64 ; fi \
+    && dnf config-manager --add-repo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}${VERSION_ID}.repo \
     && dnf -y upgrade \
     && dnf -y groupinstall "Development Tools" \
     && dnf -y builddep mariadb-server \
@@ -40,7 +58,7 @@ RUN dnf -y install 'dnf-command(config-manager)' \
     createrepo \
     curl-devel \
     flex \
-    galera \
+    galera-4 \
     java-1.8.0-openjdk-devel \
     java-1.8.0-openjdk \
     jemalloc-devel \
@@ -52,7 +70,6 @@ RUN dnf -y install 'dnf-command(config-manager)' \
     perl-autodie \
     perl-Net-SSLeay \
     python3-devel \
-    python3-scons \
     readline-devel \
     rpmlint \
     ruby \
@@ -70,4 +87,4 @@ RUN dnf -y install 'dnf-command(config-manager)' \
     && curl -sL "https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m)" >/usr/local/bin/dumb-init \
     && chmod +x /usr/local/bin/dumb-init
 
-ENV WSREP_PROVIDER=/usr/lib64/galera/libgalera_smm.so
+ENV WSREP_PROVIDER=/usr/lib64/galera-4/libgalera_smm.so

ci_build_images/centos7.Dockerfile

@@ -43,7 +43,6 @@ RUN yum -y --enablerepo=extras install epel-release \
     python3-pip \
     rpmlint \
     ruby \
-    scons \
     snappy-devel \
     systemd-devel \
     unixODBC \

ci_build_images/debian.Dockerfile

@@ -79,7 +79,6 @@ RUN . /etc/os-release \
     python3-dev \
     python3-setuptools \
     rsync \
-    scons \
     socat \
     sudo  \
     wget \

ci_build_images/fedora.Dockerfile

@@ -6,11 +6,16 @@
 ARG BASE_IMAGE
 FROM "$BASE_IMAGE"
 LABEL maintainer="MariaDB Buildbot maintainers"
+ARG INSTALL_VALGRIND
 
 # Install updates and required packages
 RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \
     && dnf -y upgrade \
-    && dnf -y install 'dnf-command(builddep)' \
+    && dnf -y install 'dnf-command(builddep)' 'dnf-command(config-manager)' \
+    && source /etc/os-release \
+    && ARCH=$(rpm --query --queryformat='%{ARCH}' rpm) \
+    && if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \
+    && dnf config-manager --add-repo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}"-fedora-"${VERSION_ID}".repo \
     && dnf -y builddep mariadb-server \
     && dnf -y install \
     @development-tools \
@@ -25,7 +30,7 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \
     dumb-init \
     flex \
     fmt-devel \
-    galera \
+    galera-4 \
     gawk \
     gdb \
     iproute \
@@ -49,16 +54,15 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \
     rpmlint \
     rsync \
     rubypick \
-    scons \
     snappy-devel \
     socat \
     unixODBC \
     unixODBC-devel \
     wget \
     which \
-    && source /etc/os-release \
     && if [ "$VERSION_ID" = 39 ]; then curl -s 'https://gitlab.kitware.com/cmake/cmake/-/raw/v3.28.5/Modules/Internal/CPack/CPackRPM.cmake?ref_type=tags' -o /usr/share/cmake/Modules/Internal/CPack/CPackRPM.cmake ; fi \
     && if [ "$(uname -m)" = "x86_64" ]; then dnf -y install libpmem-devel; fi \
+    && if [ "$INSTALL_VALGRIND" = "true" ]; then dnf -y install valgrind; fi \
     && dnf clean all
 
-ENV WSREP_PROVIDER=/usr/lib64/galera/libgalera_smm.so
+ENV WSREP_PROVIDER=/usr/lib64/galera-4/libgalera_smm.so

ci_build_images/jepsen-mysql.Dockerfile → ci_build_images/jepsen-mariadb.Dockerfile

@@ -38,8 +38,8 @@ USER buildbot
 
 WORKDIR /home/buildbot
 
-# Clone the jepsen-mysql repository, download leiningen, and set permissions
-RUN git clone https://github.com/vlad-lesin/jepsen-mysql jepsen-mariadb \
+# Clone the jepsen-mariadb repository, download leiningen, and set permissions
+RUN git clone https://github.com/MariaDB/jepsen-mariadb jepsen-mariadb \
     && curl -o /home/buildbot/lein https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein \
     && chmod a+x /home/buildbot/lein
 

ci_build_images/opensuse.Dockerfile

@@ -10,17 +10,25 @@ LABEL maintainer="MariaDB Buildbot maintainers"
 
 COPY --chmod=755 mariadb_zypper_expect /
 # Install updates and required packages
-RUN zypper update -y && \
-    zypper install -y -t pattern devel_basis && \
-    zypper install -y \
+RUN zypper update -y \
+    && zypper install -y -t pattern devel_basis \
+    && source /etc/os-release \
+    && VERSION_ID=${VERSION_ID%%.*} \
+    && ARCH=$(rpm --query --queryformat='%{ARCH}' zypper) \
+    && if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \
+    && zypper addrepo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}-${ID%%-leap}-${VERSION_ID}".repo \
+    && zypper install -y \
     bzip2 \
     ccache \
     check-devel \
+    checkpolicy \
     cmake \
     cracklib-devel \
     createrepo_c \
     curl \
     expect \
+    fmt-devel \
+    galera-4 \
     gcc-c++ \
     git \
     glibc-locale \
@@ -32,12 +40,12 @@ RUN zypper update -y && \
     libbz2-devel \
     libcurl-devel \
     libffi-devel \
-    libfmt8 \
     libgnutls-devel \
     liblz4-devel \
     libopenssl-3-devel \
     liburing2-devel \
     libxml2-devel \
+    pam-devel \
     pcre2-devel \
     perl-Net-SSLeay \
     policycoreutils \
@@ -47,8 +55,12 @@ RUN zypper update -y && \
     rpmlint \
     snappy-devel \
     subversion \
+    systemd-devel \
     wget \
     && ./mariadb_zypper_expect \
     && zypper clean -a \
     && 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)" \
     && chmod +x /usr/local/bin/dumb-init
+
+
+ENV WSREP_PROVIDER=/usr/lib64/galera-4/libgalera_smm.so

ci_build_images/pip.Dockerfile

@@ -14,7 +14,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs >/tmp/rustup-init.
     esac \
     && rm -f /tmp/rustup-init.sh \
     && source "$HOME/.cargo/env" \
-    && pip3 install --no-cache-dir -U pip \
+    # Disable until opensuse/sles dont break: && pip3 install --no-cache-dir -U pip \
     && curl -so /root/requirements.txt \
        https://raw.githubusercontent.com/MariaDB/buildbot/main/ci_build_images/requirements.txt \
     && pip3 install --no-cache-dir --no-warn-script-location -r /root/requirements.txt

ci_build_images/rhel.Dockerfile

@@ -33,6 +33,12 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
       fi \
       ;; \
     esac \
+    && source /etc/os-release \
+    && dnf -y install 'dnf-command(config-manager)' \
+    && VERSION_ID=${VERSION_ID%%.*} \
+    && ARCH=$(rpm --query --queryformat='%{ARCH}' rpm) \
+    && if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \
+    && dnf config-manager --add-repo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-${VERSION_ID}.repo \
     && subscription-manager repos --enable "codeready-builder-for-rhel-${v}-$(uname -m)-rpms" \
     && rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${v}".noarch.rpm \
     && dnf -y upgrade \
@@ -54,7 +60,7 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
     createrepo \
     curl-devel \
     flex \
-    galera \
+    galera-4 \
     java-1.8.0-openjdk-devel \
     java-1.8.0-openjdk \
     jemalloc-devel --allowerasing \
@@ -78,7 +84,6 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
     policycoreutils \
     python3 \
     python3-devel \
-    python3-scons \
     readline-devel \
     rpmlint \
     ruby \
@@ -97,4 +102,4 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
     && curl -sL "https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m)" >/usr/local/bin/dumb-init \
     && chmod +x /usr/local/bin/dumb-init
 
-ENV WSREP_PROVIDER=/usr/lib64/galera/libgalera_smm.so
+ENV WSREP_PROVIDER=/usr/lib64/galera-4/libgalera_smm.so