* [PATCH 1/6] CI: Drop test-artefacts/Makefile
2026-06-05 14:42 [PATCH for-4.22 0/6] CI: Update distros for build tests Andrew Cooper
@ 2026-06-05 14:42 ` Andrew Cooper
2026-06-05 14:42 ` [PATCH 2/6] CI: Swap ocaml-nox for ocaml in newer Debian/Ubuntu Andrew Cooper
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-05 14:42 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
This is unused since commit 3c0c177ff904 ("CI: Switch qemu-arm* jobs to using
the distro provided QEMU"), and wants never to return.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
automation/tests-artifacts/Makefile | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 automation/tests-artifacts/Makefile
diff --git a/automation/tests-artifacts/Makefile b/automation/tests-artifacts/Makefile
deleted file mode 100644
index 80a60a94f3f7..000000000000
--- a/automation/tests-artifacts/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# the base of where these containers will appear
-REGISTRY := registry.gitlab.com/xen-project/xen/tests-artifacts
-CONTAINERS = $(subst .dockerfile,,$(wildcard */*.dockerfile))
-
-help:
- @echo "Containers to build and export tests artifacts."
- @echo "To build one run 'make ARTIFACT/VERSION'. Available containers:"
- @$(foreach file,$(sort $(CONTAINERS)),echo ${file};)
- @echo "To push container builds, set the env var PUSH"
-
-%: %.dockerfile ## Builds containers
- $(DOCKER_CMD) build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $(<D)
- @if [ ! -z $${PUSH+x} ]; then \
- $(DOCKER_CMD) push $(REGISTRY)/$(@D):$(@F); \
- fi
-
-.PHONY: all
-all: $(CONTAINERS)
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/6] CI: Swap ocaml-nox for ocaml in newer Debian/Ubuntu
2026-06-05 14:42 [PATCH for-4.22 0/6] CI: Update distros for build tests Andrew Cooper
2026-06-05 14:42 ` [PATCH 1/6] CI: Drop test-artefacts/Makefile Andrew Cooper
@ 2026-06-05 14:42 ` Andrew Cooper
2026-06-05 14:42 ` [PATCH 3/6] CI: Drop Ubuntu 16.04 Andrew Cooper
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-05 14:42 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
Ocaml 4.08 and earlier had the compiler package depend on graphics, and
therefore on X. Ocaml 4.09 and later dropped this dependency.
Debian and Ubuntu versions with Ocaml 4.08 and earlier (which are Debian
Bullseye/11, and Ubuntu Focal/20.04 and earlier) had ocaml-nox packages with
this dependency stripped, which we use to keep the size of the containers
down.
In newer versions of Debian and Ubuntu, ocaml-nox is just a transitional
package referring back to ocaml. Ubuntu Resolute/26.04 has finally removed
this transitional package. For all versions where ocaml-nox is just a
transitional package, swap to the ocaml package.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
automation/build/debian/12-arm64v8.dockerfile | 2 +-
automation/build/debian/12-x86_32.dockerfile | 2 +-
automation/build/debian/12-x86_64.dockerfile | 2 +-
automation/build/debian/13-arm64v8.dockerfile | 2 +-
automation/build/debian/13-x86_32.dockerfile | 2 +-
automation/build/debian/13-x86_64.dockerfile | 2 +-
automation/build/ubuntu/22.04-x86_64.dockerfile | 2 +-
automation/build/ubuntu/24.04-x86_64.dockerfile | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/automation/build/debian/12-arm64v8.dockerfile b/automation/build/debian/12-arm64v8.dockerfile
index c0e08a010f6a..5cc4de822cc6 100644
--- a/automation/build/debian/12-arm64v8.dockerfile
+++ b/automation/build/debian/12-arm64v8.dockerfile
@@ -46,7 +46,7 @@ RUN <<EOF
# Golang bindings
golang-go
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
# for test phase, qemu-* jobs
diff --git a/automation/build/debian/12-x86_32.dockerfile b/automation/build/debian/12-x86_32.dockerfile
index 447152d7e5e4..3457eca78203 100644
--- a/automation/build/debian/12-x86_32.dockerfile
+++ b/automation/build/debian/12-x86_32.dockerfile
@@ -38,7 +38,7 @@ RUN <<EOF
python3-dev
python3-setuptools
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
)
diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile
index 4e533ee879fd..afb16f371126 100644
--- a/automation/build/debian/12-x86_64.dockerfile
+++ b/automation/build/debian/12-x86_64.dockerfile
@@ -50,7 +50,7 @@ RUN <<EOF
# Golang bindings
golang-go
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
# for test phase, qemu-* jobs
diff --git a/automation/build/debian/13-arm64v8.dockerfile b/automation/build/debian/13-arm64v8.dockerfile
index b9062ee8b443..1a29ad153cea 100644
--- a/automation/build/debian/13-arm64v8.dockerfile
+++ b/automation/build/debian/13-arm64v8.dockerfile
@@ -46,7 +46,7 @@ RUN <<EOF
# Golang bindings
golang-go
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
# for test phase, qemu-* jobs
diff --git a/automation/build/debian/13-x86_32.dockerfile b/automation/build/debian/13-x86_32.dockerfile
index 464b4fc55e38..204d3c1e6dd0 100644
--- a/automation/build/debian/13-x86_32.dockerfile
+++ b/automation/build/debian/13-x86_32.dockerfile
@@ -38,7 +38,7 @@ RUN <<EOF
python3-dev
python3-setuptools
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
)
diff --git a/automation/build/debian/13-x86_64.dockerfile b/automation/build/debian/13-x86_64.dockerfile
index 2c6c9d4a5098..ebf28a69e278 100644
--- a/automation/build/debian/13-x86_64.dockerfile
+++ b/automation/build/debian/13-x86_64.dockerfile
@@ -50,7 +50,7 @@ RUN <<EOF
# Golang bindings
golang-go
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
# for test phase, qemu-* jobs
diff --git a/automation/build/ubuntu/22.04-x86_64.dockerfile b/automation/build/ubuntu/22.04-x86_64.dockerfile
index 6ae7f4faa859..47aadc0548ab 100644
--- a/automation/build/ubuntu/22.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/22.04-x86_64.dockerfile
@@ -51,7 +51,7 @@ RUN <<EOF
python3-dev
python3-setuptools
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
# Stubdom download/extract
diff --git a/automation/build/ubuntu/24.04-x86_64.dockerfile b/automation/build/ubuntu/24.04-x86_64.dockerfile
index 84777d188c0d..a41632d5cf6c 100644
--- a/automation/build/ubuntu/24.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/24.04-x86_64.dockerfile
@@ -51,7 +51,7 @@ RUN <<EOF
python3-dev
python3-setuptools
# Ocaml bindings/oxenstored
- ocaml-nox
+ ocaml
ocaml-findlib
# Stubdom download/extract
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/6] CI: Drop Ubuntu 16.04
2026-06-05 14:42 [PATCH for-4.22 0/6] CI: Update distros for build tests Andrew Cooper
2026-06-05 14:42 ` [PATCH 1/6] CI: Drop test-artefacts/Makefile Andrew Cooper
2026-06-05 14:42 ` [PATCH 2/6] CI: Swap ocaml-nox for ocaml in newer Debian/Ubuntu Andrew Cooper
@ 2026-06-05 14:42 ` Andrew Cooper
2026-06-05 14:42 ` [PATCH 4/6] CI: Add Ubuntu 26.04 Andrew Cooper
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-05 14:42 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
Ubuntu 16.04 is now fully out of support.
Introduce an 18.04 GCC Debug job in lieu of losing the 16.04 job.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
.../build/ubuntu/16.04-x86_64.dockerfile | 65 -------------------
automation/gitlab-ci/build.yaml | 11 +---
2 files changed, 3 insertions(+), 73 deletions(-)
delete mode 100644 automation/build/ubuntu/16.04-x86_64.dockerfile
diff --git a/automation/build/ubuntu/16.04-x86_64.dockerfile b/automation/build/ubuntu/16.04-x86_64.dockerfile
deleted file mode 100644
index 72a46389fa0d..000000000000
--- a/automation/build/ubuntu/16.04-x86_64.dockerfile
+++ /dev/null
@@ -1,65 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 ubuntu:16.04
-LABEL maintainer.name="The Xen Project"
-LABEL maintainer.email="xen-devel@lists.xenproject.org"
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN <<EOF
-#!/bin/bash
- set -e
-
- useradd --create-home user
-
- apt-get update
-
- DEPS=(
- # Xen
- bison
- build-essential
- checkpolicy
- clang
- flex
- python3-minimal
-
- # Tools (general)
- ca-certificates
- cpio
- git-core
- gzip
- patch
- perl
- pkg-config
- wget
- # libxenguest dombuilder
- libbz2-dev
- libzstd-dev
- liblzo2-dev
- liblzma-dev
- zlib1g-dev
- # libacpi
- acpica-tools
- # libxl
- uuid-dev
- libyajl-dev
- # RomBIOS
- bcc
- bin86
- # xentop
- libncurses5-dev
- # Python bindings
- python3-dev
- # Ocaml bindings/oxenstored
- ocaml-nox
- ocaml-findlib
-
- # Stubdom download/extract
- bzip2
- )
-
- apt-get -y --no-install-recommends install "${DEPS[@]}"
- rm -rf /var/lib/apt/lists/*
-EOF
-
-USER user
-WORKDIR /build
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 0e5fb26c853e..5a933e42f1ab 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -617,18 +617,13 @@ fedora-41-x86_64-gcc-debug:
variables:
CONTAINER: fedora:41-x86_64
-ubuntu-16.04-x86_64-gcc:
+ubuntu-18.04-x86_64-gcc:
extends: .gcc-x86-64-build
variables:
- CONTAINER: ubuntu:16.04-x86_64
+ CONTAINER: ubuntu:18.04-x86_64
-ubuntu-16.04-x86_64-gcc-debug:
+ubuntu-18.04-x86_64-gcc-debug:
extends: .gcc-x86-64-build-debug
- variables:
- CONTAINER: ubuntu:16.04-x86_64
-
-ubuntu-18.04-x86_64-gcc:
- extends: .gcc-x86-64-build
variables:
CONTAINER: ubuntu:18.04-x86_64
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/6] CI: Add Ubuntu 26.04
2026-06-05 14:42 [PATCH for-4.22 0/6] CI: Update distros for build tests Andrew Cooper
` (2 preceding siblings ...)
2026-06-05 14:42 ` [PATCH 3/6] CI: Drop Ubuntu 16.04 Andrew Cooper
@ 2026-06-05 14:42 ` Andrew Cooper
2026-06-05 14:42 ` [PATCH 5/6] CI: Update Fedora to 43 Andrew Cooper
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-05 14:42 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
Swap yajl for json-c, given the deprecation of the former.
Add 26.04 GCC/Clang debug/non-debug jobs. Drop the 24.04 debug jobs to keep
the overall job count down.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
.../build/ubuntu/26.04-x86_64.dockerfile | 74 +++++++++++++++++++
automation/gitlab-ci/build.yaml | 22 ++++--
2 files changed, 90 insertions(+), 6 deletions(-)
create mode 100644 automation/build/ubuntu/26.04-x86_64.dockerfile
diff --git a/automation/build/ubuntu/26.04-x86_64.dockerfile b/automation/build/ubuntu/26.04-x86_64.dockerfile
new file mode 100644
index 000000000000..64729c00f2a6
--- /dev/null
+++ b/automation/build/ubuntu/26.04-x86_64.dockerfile
@@ -0,0 +1,74 @@
+# syntax=docker/dockerfile:1
+FROM --platform=linux/amd64 ubuntu:26.04
+LABEL maintainer.name="The Xen Project"
+LABEL maintainer.email="xen-devel@lists.xenproject.org"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN <<EOF
+#!/bin/bash
+ set -e
+
+ useradd --create-home user
+
+ apt-get update
+
+ DEPS=(
+ # Xen
+ bison
+ build-essential
+ checkpolicy
+ clang
+ flex
+ python3-minimal
+
+ # Tools (general)
+ ca-certificates
+ cpio
+ git-core
+ gzip
+ patch
+ perl
+ pkg-config
+ wget
+ # libxenguest dombuilder
+ libbz2-dev
+ libzstd-dev
+ liblzo2-dev
+ liblzma-dev
+ zlib1g-dev
+ # libacpi
+ acpica-tools
+ # libxl
+ uuid-dev
+ libjson-c-dev
+ # RomBIOS
+ bcc
+ bin86
+ # xentop
+ libncurses5-dev
+ # Python bindings
+ python3-dev
+ python3-setuptools
+ # Ocaml bindings/oxenstored
+ ocaml
+ ocaml-findlib
+
+ # Stubdom download/extract
+ bzip2
+
+ # Qemu build
+ libglib2.0-dev
+ libpixman-1-dev
+ meson
+ ninja-build
+ python3-packaging
+ python3-venv
+ )
+
+ apt-get -y --no-install-recommends install "${DEPS[@]}"
+ rm -rf /var/lib/apt/lists/*
+EOF
+
+USER user
+WORKDIR /build
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 5a933e42f1ab..6d27cc8eb613 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -652,20 +652,30 @@ ubuntu-24.04-x86_64-clang:
variables:
CONTAINER: ubuntu:24.04-x86_64
-ubuntu-24.04-x86_64-clang-debug:
- extends: .clang-x86-64-build-debug
+ubuntu-24.04-x86_64-gcc:
+ extends: .gcc-x86-64-build
variables:
CONTAINER: ubuntu:24.04-x86_64
-ubuntu-24.04-x86_64-gcc:
+ubuntu-26.04-x86_64-clang:
+ extends: .clang-x86-64-build
+ variables:
+ CONTAINER: ubuntu:26.04-x86_64
+
+ubuntu-26.04-x86_64-clang-debug:
+ extends: .clang-x86-64-build-debug
+ variables:
+ CONTAINER: ubuntu:26.04-x86_64
+
+ubuntu-26.04-x86_64-gcc:
extends: .gcc-x86-64-build
variables:
- CONTAINER: ubuntu:24.04-x86_64
+ CONTAINER: ubuntu:26.04-x86_64
-ubuntu-24.04-x86_64-gcc-debug:
+ubuntu-26.04-x86_64-gcc-debug:
extends: .gcc-x86-64-build-debug
variables:
- CONTAINER: ubuntu:24.04-x86_64
+ CONTAINER: ubuntu:26.04-x86_64
opensuse-leap-15.6-clang:
extends: .clang-x86-64-build
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/6] CI: Update Fedora to 43
2026-06-05 14:42 [PATCH for-4.22 0/6] CI: Update distros for build tests Andrew Cooper
` (3 preceding siblings ...)
2026-06-05 14:42 ` [PATCH 4/6] CI: Add Ubuntu 26.04 Andrew Cooper
@ 2026-06-05 14:42 ` Andrew Cooper
2026-06-05 14:42 ` [PATCH 6/6] CI: Update Opensuse 15.6 to 16.0 Andrew Cooper
2026-06-05 18:04 ` [PATCH for-4.22 0/6] CI: Update distros for build tests dmukhin
6 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-05 14:42 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
Swap yajl for json-c, given the deprecation of the former.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
.../fedora/{41-x86_64.dockerfile => 43-x86_64.dockerfile} | 4 ++--
automation/gitlab-ci/build.yaml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
rename automation/build/fedora/{41-x86_64.dockerfile => 43-x86_64.dockerfile} (95%)
diff --git a/automation/build/fedora/41-x86_64.dockerfile b/automation/build/fedora/43-x86_64.dockerfile
similarity index 95%
rename from automation/build/fedora/41-x86_64.dockerfile
rename to automation/build/fedora/43-x86_64.dockerfile
index e33329aedc9e..b748ef09cf3c 100644
--- a/automation/build/fedora/41-x86_64.dockerfile
+++ b/automation/build/fedora/43-x86_64.dockerfile
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 fedora:41
+FROM --platform=linux/amd64 fedora:43
LABEL maintainer.name="The Xen Project"
LABEL maintainer.email="xen-devel@lists.xenproject.org"
@@ -41,7 +41,7 @@ RUN <<EOF
acpica-tools
# libxl
libuuid-devel
- yajl-devel
+ json-c-devel
# xen-foreign
diffutils
# RomBIOS
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 6d27cc8eb613..061977872f5b 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -607,15 +607,15 @@ debian-13-x86_32-gcc-debug:
variables:
CONTAINER: debian:13-x86_32
-fedora-41-x86_64-gcc:
+fedora-43-x86_64-gcc:
extends: .gcc-x86-64-build
variables:
- CONTAINER: fedora:41-x86_64
+ CONTAINER: fedora:43-x86_64
-fedora-41-x86_64-gcc-debug:
+fedora-43-x86_64-gcc-debug:
extends: .gcc-x86-64-build-debug
variables:
- CONTAINER: fedora:41-x86_64
+ CONTAINER: fedora:43-x86_64
ubuntu-18.04-x86_64-gcc:
extends: .gcc-x86-64-build
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6] CI: Update Opensuse 15.6 to 16.0
2026-06-05 14:42 [PATCH for-4.22 0/6] CI: Update distros for build tests Andrew Cooper
` (4 preceding siblings ...)
2026-06-05 14:42 ` [PATCH 5/6] CI: Update Fedora to 43 Andrew Cooper
@ 2026-06-05 14:42 ` Andrew Cooper
2026-06-05 18:04 ` [PATCH for-4.22 0/6] CI: Update distros for build tests dmukhin
6 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-05 14:42 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
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.
bin86/dev86 are no longer available.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
...64.dockerfile => leap-16.0-x86_64.dockerfile} | 16 ++++++----------
automation/gitlab-ci/build.yaml | 16 ++++++++--------
2 files changed, 14 insertions(+), 18 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 33db3ecd634b..f88866bb8740 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
@@ -46,17 +45,14 @@ RUN <<EOF
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 +66,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 061977872f5b..acd4acf13138 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
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH for-4.22 0/6] CI: Update distros for build tests
2026-06-05 14:42 [PATCH for-4.22 0/6] CI: Update distros for build tests Andrew Cooper
` (5 preceding siblings ...)
2026-06-05 14:42 ` [PATCH 6/6] CI: Update Opensuse 15.6 to 16.0 Andrew Cooper
@ 2026-06-05 18:04 ` dmukhin
2026-06-05 19:45 ` Stefano Stabellini
6 siblings, 1 reply; 9+ messages in thread
From: dmukhin @ 2026-06-05 18:04 UTC (permalink / raw)
To: Andrew Cooper
Cc: Xen-devel, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
On Fri, Jun 05, 2026 at 03:42:07PM +0100, Andrew Cooper wrote:
> Refresh which distros we do build testing with
>
> https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2579549654
>
> Andrew Cooper (6):
> CI: Drop test-artefacts/Makefile
> CI: Swap ocaml-nox for ocaml in newer Debian/Ubuntu
> CI: Drop Ubuntu 16.04
> CI: Add Ubuntu 26.04
> CI: Update Fedora to 43
> CI: Update Opensuse 15.6 to 16.0
Please consider:
Reviewed-by: Denis Mukhin <dmukhin@ford.com>
for the entire series.
>
> automation/build/debian/12-arm64v8.dockerfile | 2 +-
> automation/build/debian/12-x86_32.dockerfile | 2 +-
> automation/build/debian/12-x86_64.dockerfile | 2 +-
> automation/build/debian/13-arm64v8.dockerfile | 2 +-
> automation/build/debian/13-x86_32.dockerfile | 2 +-
> automation/build/debian/13-x86_64.dockerfile | 2 +-
> ...x86_64.dockerfile => 43-x86_64.dockerfile} | 4 +-
> ...dockerfile => leap-16.0-x86_64.dockerfile} | 16 ++----
> .../build/ubuntu/22.04-x86_64.dockerfile | 2 +-
> .../build/ubuntu/24.04-x86_64.dockerfile | 2 +-
> ..._64.dockerfile => 26.04-x86_64.dockerfile} | 15 ++++-
> automation/gitlab-ci/build.yaml | 57 ++++++++++---------
> automation/tests-artifacts/Makefile | 19 -------
> 13 files changed, 59 insertions(+), 68 deletions(-)
> rename automation/build/fedora/{41-x86_64.dockerfile => 43-x86_64.dockerfile} (95%)
> rename automation/build/opensuse/{leap-15.6-x86_64.dockerfile => leap-16.0-x86_64.dockerfile} (84%)
> rename automation/build/ubuntu/{16.04-x86_64.dockerfile => 26.04-x86_64.dockerfile} (81%)
> delete mode 100644 automation/tests-artifacts/Makefile
>
> --
> 2.39.5
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH for-4.22 0/6] CI: Update distros for build tests
2026-06-05 18:04 ` [PATCH for-4.22 0/6] CI: Update distros for build tests dmukhin
@ 2026-06-05 19:45 ` Stefano Stabellini
0 siblings, 0 replies; 9+ messages in thread
From: Stefano Stabellini @ 2026-06-05 19:45 UTC (permalink / raw)
To: dmukhin
Cc: Andrew Cooper, Xen-devel, Anthony PERARD, Stefano Stabellini,
Michal Orzel, Doug Goldstein, Roger Pau Monné, Juergen Gross,
Oleksii Kurochko
On Fri, 5 Jun 2026, dmukhin@ford.com wrote:
> On Fri, Jun 05, 2026 at 03:42:07PM +0100, Andrew Cooper wrote:
> > Refresh which distros we do build testing with
> >
> > https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2579549654
> >
> > Andrew Cooper (6):
> > CI: Drop test-artefacts/Makefile
> > CI: Swap ocaml-nox for ocaml in newer Debian/Ubuntu
> > CI: Drop Ubuntu 16.04
> > CI: Add Ubuntu 26.04
> > CI: Update Fedora to 43
> > CI: Update Opensuse 15.6 to 16.0
>
> Please consider:
>
> Reviewed-by: Denis Mukhin <dmukhin@ford.com>
>
> for the entire series.
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread