From 4b361f865f884a3a6def463ce747c54388ff56bb Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 1 Aug 2024 13:10:39 +1000 Subject: [PATCH] MDBF-779 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 | 5 +++++ .github/workflows/build-sles.pip-based.yml | 5 +++++ ci_build_images/opensuse.Dockerfile | 4 ++-- ci_build_images/sles.Dockerfile | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-opensuse.pip-based.yml b/.github/workflows/build-opensuse.pip-based.yml index 587650bd..87064da4 100644 --- a/.github/workflows/build-opensuse.pip-based.yml +++ b/.github/workflows/build-opensuse.pip-based.yml @@ -27,6 +27,11 @@ jobs: fail-fast: false matrix: include: + - image: opensuse/leap:15.5 + platforms: linux/amd64 + tag: opensuse15.5 + nogalera: true + - image: opensuse/leap:15.6 platforms: linux/amd64 tag: opensuse15 diff --git a/.github/workflows/build-sles.pip-based.yml b/.github/workflows/build-sles.pip-based.yml index 9e1508e8..c6305d49 100644 --- a/.github/workflows/build-sles.pip-based.yml +++ b/.github/workflows/build-sles.pip-based.yml @@ -28,6 +28,11 @@ jobs: fail-fast: false matrix: include: + - image: registry.suse.com/bci/bci-base:15.5 + platforms: linux/amd64, linux/s390x + tag: sles15.5 + nogalera: true + - image: registry.suse.com/bci/bci-base:15.6 platforms: linux/amd64, linux/s390x tag: sles15 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 \