From 47f116c2b2ffe9d07ef104bbb57e0cd73a528a02 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 1 Aug 2024 13:10:39 +1000
Subject: [PATCH] Add opensuse-15.5 and sles-15.5

Need to go back a python version to maintain support with 15.6.
---
 .github/workflows/build-opensuse.pip-based.yml | 2 ++
 .github/workflows/build-sles.pip-based.yml     | 2 ++
 ci_build_images/opensuse.Dockerfile            | 4 ++--
 ci_build_images/sles.Dockerfile                | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-opensuse.pip-based.yml b/.github/workflows/build-opensuse.pip-based.yml
index d99a4807..4a74074c 100644
--- a/.github/workflows/build-opensuse.pip-based.yml
+++ b/.github/workflows/build-opensuse.pip-based.yml
@@ -30,12 +30,14 @@ jobs:
           - image: opensuse/leap:15.6
             platforms: linux/amd64
             tag: opensuse15
+            nogalera: true
     uses: ./.github/workflows/bbw_build_container_template.yml
     with:
       dockerfile: opensuse.Dockerfile pip.Dockerfile
       image: ${{ matrix.image }}
       platforms: ${{ matrix.platforms }}
       tag: ${{ matrix.tag }}
+      nogalera: ${{ matrix.nogalera }}
       files:
         '[
           {"name": "mariadb_zypper_expect", "source": "''$WORKDIR/mariadb_zypper_expect''", "target": "''$GITHUB_WORKSPACE''"}
diff --git a/.github/workflows/build-sles.pip-based.yml b/.github/workflows/build-sles.pip-based.yml
index 05318972..24b0f3ce 100644
--- a/.github/workflows/build-sles.pip-based.yml
+++ b/.github/workflows/build-sles.pip-based.yml
@@ -31,12 +31,14 @@ jobs:
           - image: registry.suse.com/bci/bci-base:15.6
             platforms: linux/amd64, linux/s390x
             tag: sles15
+            nogalera: true
     uses: ./.github/workflows/bbw_build_container_template.yml
     with:
       dockerfile: sles.Dockerfile pip.Dockerfile
       image: ${{ matrix.image }}
       platforms: ${{ matrix.platforms }}
       tag: ${{ matrix.tag }}
+      nogalera: ${{ matrix.nogalera }}
       files:
         '[
           {"name": "mariadb_zypper_expect", "source": "''$WORKDIR/mariadb_zypper_expect''", "target": "''$GITHUB_WORKSPACE''"}
diff --git a/ci_build_images/opensuse.Dockerfile b/ci_build_images/opensuse.Dockerfile
index dafe3aa5..18835eee 100644
--- a/ci_build_images/opensuse.Dockerfile
+++ b/ci_build_images/opensuse.Dockerfile
@@ -49,8 +49,8 @@ RUN zypper update -y \
     pcre2-devel \
     perl-Net-SSLeay \
     policycoreutils \
-    python312-devel \
-    python312-pip \
+    python311-devel \
+    python311-pip \
     rpm-build \
     rpmlint \
     snappy-devel \
diff --git a/ci_build_images/sles.Dockerfile b/ci_build_images/sles.Dockerfile
index ac00d80c..ee431155 100644
--- a/ci_build_images/sles.Dockerfile
+++ b/ci_build_images/sles.Dockerfile
@@ -47,8 +47,8 @@ RUN zypper -n update \
     pcre2-devel \
     perl-Net-SSLeay \
     policycoreutils \
-    python312-devel \
-    python312-pip \
+    python311-devel \
+    python311-pip \
     rpm-build \
     rpmlint \
     snappy-devel \