From 4b859e8a4ffad15cdc09021c97daf60259d5cb48 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/bbw_build_container.yml | 10 ++++++++++
 ci_build_images/opensuse.Dockerfile       |  4 ++--
 ci_build_images/sles.Dockerfile           |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/bbw_build_container.yml b/.github/workflows/bbw_build_container.yml
index 8de345c8..b454743d 100644
--- a/.github/workflows/bbw_build_container.yml
+++ b/.github/workflows/bbw_build_container.yml
@@ -105,6 +105,11 @@ jobs:
             platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
             # //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.5
+            tag: opensuse15.5
+            platforms: linux/amd64
+            nogalera: true
           - dockerfile: opensuse.Dockerfile pip.Dockerfile
             image: opensuse/leap:15.6
             tag: opensuse15
@@ -113,6 +118,11 @@ jobs:
             image: registry.suse.com/bci/bci-base:15.6
             tag: sles15
             platforms: linux/amd64, linux/s390x
+          - dockerfile: sles.Dockerfile pip.Dockerfile
+            image: registry.suse.com/bci/bci-base:15.5
+            tag: sles15.5
+            platforms: linux/amd64, linux/s390x
+            nogalera: true
           - dockerfile: centos.Dockerfile
             image: rockylinux:8
             platforms: linux/amd64, linux/arm64/v8
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 \