From 37df17d2f903503c619713eb01e488f2cb1a257f Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 5 Jun 2026 13:47:24 +0100
Subject: [PATCH] CI: Update Opensuse 15.6 to 16.0

The default version of python is 3.13, so drop the 3.11 overrides.

Swap yajl for json-c, given the deprecation of the former.  Add lz4.

bin86/dev86 are no longer available.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Denis Mukhin <dmukhin@ford.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
 ...dockerfile => leap-16.0-x86_64.dockerfile} | 19 ++++++++-----------
 automation/gitlab-ci/build.yaml               | 16 ++++++++--------
 2 files changed, 16 insertions(+), 19 deletions(-)
 rename automation/build/opensuse/{leap-15.6-x86_64.dockerfile => leap-16.0-x86_64.dockerfile} (84%)

diff --git a/automation/build/opensuse/leap-15.6-x86_64.dockerfile b/automation/build/opensuse/leap-16.0-x86_64.dockerfile
similarity index 84%
rename from automation/build/opensuse/leap-15.6-x86_64.dockerfile
rename to automation/build/opensuse/leap-16.0-x86_64.dockerfile
index 33db3ecd63..e5d0e72773 100644
--- a/automation/build/opensuse/leap-15.6-x86_64.dockerfile
+++ b/automation/build/opensuse/leap-16.0-x86_64.dockerfile
@@ -1,9 +1,8 @@
 # syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 opensuse/leap:15.6
+FROM --platform=linux/amd64 opensuse/leap:16.0
 LABEL maintainer.name="The Xen Project"
 LABEL maintainer.email="xen-devel@lists.xenproject.org"
 
-ENV PYTHON=python3.11
 ENV XEN_TARGET_ARCH=x86_64
 
 RUN <<EOF
@@ -26,7 +25,7 @@ RUN <<EOF
         gawk
         gcc
         make
-        python311
+        python3
 
         # Tools (general)
         cpio
@@ -38,25 +37,23 @@ RUN <<EOF
         wget
         # libxenguest dombuilder
         'pkgconfig(bzip2)'
+        'pkgconfig(liblz4)'
+        'pkgconfig(liblzma)'
         'pkgconfig(libzstd)'
         'pkgconfig(lzo2)'
-        'pkgconfig(liblzma)'
         'pkgconfig(zlib)'
         # libacpi
         acpica
         # libxl
         'pkgconfig(uuid)'
-        'pkgconfig(yajl)'
-        # RomBIOS
-        bin86
-        dev86
+        'pkgconfig(json-c)'
         # Header Check
         gcc-c++
         # xentop
         'pkgconfig(ncurses)'
         # Python bindings
-        python311-devel
-        python311-setuptools
+        python3-devel
+        python3-setuptools
         # Ocaml bindings/oxenstored
         ocaml
         ocaml-findlib
@@ -70,7 +67,7 @@ RUN <<EOF
         ninja
         'pkgconfig(glib-2.0)'
         'pkgconfig(pixman-1)'
-        python311-packaging
+        python3-packaging
     )
 
     zypper install -y --no-recommends "${DEPS[@]}"
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 061977872f..acd4acf131 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -677,25 +677,25 @@ ubuntu-26.04-x86_64-gcc-debug:
   variables:
     CONTAINER: ubuntu:26.04-x86_64
 
-opensuse-leap-15.6-clang:
+opensuse-leap-16.0-clang:
   extends: .clang-x86-64-build
   variables:
-    CONTAINER: opensuse:leap-15.6-x86_64
+    CONTAINER: opensuse:leap-16.0-x86_64
 
-opensuse-leap-15.6-clang-debug:
+opensuse-leap-16.0-clang-debug:
   extends: .clang-x86-64-build-debug
   variables:
-    CONTAINER: opensuse:leap-15.6-x86_64
+    CONTAINER: opensuse:leap-16.0-x86_64
 
-opensuse-leap-15.6-gcc:
+opensuse-leap-16.0-gcc:
   extends: .gcc-x86-64-build
   variables:
-    CONTAINER: opensuse:leap-15.6-x86_64
+    CONTAINER: opensuse:leap-16.0-x86_64
 
-opensuse-leap-15.6-gcc-debug:
+opensuse-leap-16.0-gcc-debug:
   extends: .gcc-x86-64-build-debug
   variables:
-    CONTAINER: opensuse:leap-15.6-x86_64
+    CONTAINER: opensuse:leap-16.0-x86_64
 
 opensuse-tumbleweed-clang:
   extends: .clang-x86-64-build