From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 8 Jan 2025 12:05:38 +0000 (+0000)
Subject: CI: Update Fedora to 41
X-Git-Tag: 4.20.0-rc1~6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=40f35d07aa14bde44d7baafad171f7c92b053017;p=xen.git

CI: Update Fedora to 41

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/automation/build/fedora/40-x86_64.dockerfile b/automation/build/fedora/40-x86_64.dockerfile
deleted file mode 100644
index 7d4d4cc2ac..0000000000
--- a/automation/build/fedora/40-x86_64.dockerfile
+++ /dev/null
@@ -1,77 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 fedora:40
-LABEL maintainer.name="The Xen Project"
-LABEL maintainer.email="xen-devel@lists.xenproject.org"
-
-RUN <<EOF
-    set -e
-
-    useradd --create-home user
-
-    dnf -y update
-
-    DEPS=(
-        # Xen
-        binutils
-        gcc
-        make
-        python3
-        # Kconfig
-        bison
-        flex
-        # Flask
-        checkpolicy
-
-        # Tools (general)
-        git-core
-        gzip
-        patch
-        perl-interpreter
-        perl-File-Find
-        pkgconfig
-        wget
-        # libxenguest dombuilder
-        bzip2-devel
-        libzstd-devel
-        lzo-devel
-        xz-devel
-        zlib-devel
-        # libacpi
-        acpica-tools
-        # libxl
-        libuuid-devel
-        yajl-devel
-        # xen-foreign
-        diffutils
-        # RomBIOS
-        dev86
-        # Header Check
-        gcc-c++
-        # xentop
-        ncurses-devel
-        # Python bindings
-        python3-devel
-        python3-setuptools
-        # Ocaml bindings/oxenstored
-        ocaml
-        ocaml-findlib
-        # Golang bindings
-        golang
-
-        # Stubdom download/extract
-        bzip2
-
-        # Qemu build
-        glib2-devel
-        pixman-devel
-        ninja-build
-    )
-
-    dnf -y --setopt=install_weak_deps=False install "${DEPS[@]}"
-
-    dnf clean all
-    rm -rf /var/cache/dnf
-EOF
-
-USER user
-WORKDIR /build
diff --git a/automation/build/fedora/41-x86_64.dockerfile b/automation/build/fedora/41-x86_64.dockerfile
new file mode 100644
index 0000000000..8032a20986
--- /dev/null
+++ b/automation/build/fedora/41-x86_64.dockerfile
@@ -0,0 +1,77 @@
+# syntax=docker/dockerfile:1
+FROM --platform=linux/amd64 fedora:41
+LABEL maintainer.name="The Xen Project"
+LABEL maintainer.email="xen-devel@lists.xenproject.org"
+
+RUN <<EOF
+    set -e
+
+    useradd --create-home user
+
+    dnf -y update
+
+    DEPS=(
+        # Xen
+        binutils
+        gcc
+        make
+        python3
+        # Kconfig
+        bison
+        flex
+        # Flask
+        checkpolicy
+
+        # Tools (general)
+        git-core
+        gzip
+        patch
+        perl-interpreter
+        perl-File-Find
+        pkgconfig
+        wget
+        # libxenguest dombuilder
+        bzip2-devel
+        libzstd-devel
+        lzo-devel
+        xz-devel
+        zlib-devel
+        # libacpi
+        acpica-tools
+        # libxl
+        libuuid-devel
+        yajl-devel
+        # xen-foreign
+        diffutils
+        # RomBIOS
+        dev86
+        # Header Check
+        gcc-c++
+        # xentop
+        ncurses-devel
+        # Python bindings
+        python3-devel
+        python3-setuptools
+        # Ocaml bindings/oxenstored
+        ocaml
+        ocaml-findlib
+        # Golang bindings
+        golang
+
+        # Stubdom download/extract
+        bzip2
+
+        # Qemu build
+        glib2-devel
+        pixman-devel
+        ninja-build
+    )
+
+    dnf -y --setopt=install_weak_deps=False install "${DEPS[@]}"
+
+    dnf clean all
+    rm -rf /var/cache/dnf
+EOF
+
+USER user
+WORKDIR /build
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 41f17ed456..3abd2a0c65 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -572,15 +572,15 @@ debian-12-x86_32-gcc-debug:
   variables:
     CONTAINER: debian:12-x86_32
 
-fedora-40-x86_64-gcc:
+fedora-41-x86_64-gcc:
   extends: .gcc-x86-64-build
   variables:
-    CONTAINER: fedora:40-x86_64
+    CONTAINER: fedora:41-x86_64
 
-fedora-40-x86_64-gcc-debug:
+fedora-41-x86_64-gcc-debug:
   extends: .gcc-x86-64-build-debug
   variables:
-    CONTAINER: fedora:40-x86_64
+    CONTAINER: fedora:41-x86_64
 
 ubuntu-16.04-x86_64-clang:
   extends: .clang-x86-64-build
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index d72c22c103..bc43136078 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -28,7 +28,7 @@ case "_${CONTAINER}" in
     _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.18-arm64v8" ;;
     _archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;;
     _centos7) CONTAINER="${BASE}/centos:7" ;;
-    _fedora) CONTAINER="${BASE}/fedora:40-x86_64";;
+    _fedora) CONTAINER="${BASE}/fedora:41-x86_64";;
     _bullseye-ppc64le) CONTAINER="${BASE}/debian:11-ppc64le" ;;
     _bookworm-ppc64le) CONTAINER="${BASE}/debian:12-ppc64le" ;;
     _bullseye-riscv64) CONTAINER="${BASE}/debian:11-riscv64" ;;