From 45e1ffeceba767c7e996c0a6770a574f39351a0d Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Thu, 24 Oct 2024 16:40:30 +0200
Subject: [PATCH] ci: upgrade the fedora image from 38 to 41

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31890>
---
 .gitlab-ci/container/fedora/x86_64_build.sh | 1 +
 .gitlab-ci/container/gitlab-ci.yml          | 2 +-
 .gitlab-ci/image-tags.yml                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh
index 65a64e32d6d..c82b13705a2 100644
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -74,6 +74,7 @@ DEPS=(
     python-unversioned-command
     python3-devel
     python3-mako
+    python3-packaging
     python3-ply
     python3-pycparser
     python3-yaml
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index d52e70245e0..85c6e038773 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -393,7 +393,7 @@ fedora/x86_64_build:
     - .fdo.container-build@fedora
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: 38
+    FDO_DISTRIBUTION_VERSION: 41
     MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
 
 .use-fedora/x86_64_build:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 9be4a1f5b86..d998ce1dfac 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -37,7 +37,7 @@ variables:
 
    ALPINE_X86_64_BUILD_TAG: "20241106-wlproto2"
    ALPINE_X86_64_LAVA_SSH_TAG: "20241106-wlproto2"
-   FEDORA_X86_64_BUILD_TAG: "20241106-wlproto2"
+   FEDORA_X86_64_BUILD_TAG: "20241107-fc41"
    KERNEL_TAG: "v6.6.21-mesa-f8ea"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "bca9635d"