ci: Switch to newer Fedora

Fedora-37 is EOL and Fedora-39 is not tested at all. Switch to Fedora 38 and 39 and refresh with latest lcitool manifest. Signed-off-by: Michal Privoznik <[email protected]>
libvirt · Jan 16, 2024 · abc42b1 · abc42b1
1 parent c0d8fb2
commit abc42b1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/ci/buildenv/almalinux-8.sh b/ci/buildenv/almalinux-8.sh
@@ -37,7 +37,6 @@ function install_buildenv() {
         pkgconfig \
         python3 \
         python3-docutils \
-        rpcgen \
         rust
     rpm -qa | sort > /packages.txt
     mkdir -p /usr/libexec/ccache-wrappers

diff --git a/ci/buildenv/fedora-37.sh → ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-37.sh → ci/buildenv/fedora-39.sh
diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile
@@ -38,7 +38,6 @@ RUN dnf update -y && \
         pkgconfig \
         python3 \
         python3-docutils \
-        rpcgen \
         rust && \
     dnf autoremove -y && \
     dnf clean all -y && \

diff --git a/ci/containers/fedora-37.Dockerfile → ci/containers/fedora-39.Dockerfile b/ci/containers/fedora-37.Dockerfile → ci/containers/fedora-39.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:37
+FROM registry.fedoraproject.org/fedora:39
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
@@ -133,44 +133,44 @@ x86_64-debian-sid-local-env:
     NAME: debian-sid
 
 
-x86_64-fedora-37-prebuilt-env:
+x86_64-fedora-38-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
-    - job: x86_64-fedora-37-container
+    - job: x86_64-fedora-38-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-37
+    NAME: fedora-38
 
-x86_64-fedora-37-local-env:
+x86_64-fedora-38-local-env:
   extends: .native_build_job_local_env
   needs: []
   allow_failure: false
   variables:
-    IMAGE: registry.fedoraproject.org/fedora:37
-    NAME: fedora-37
+    IMAGE: registry.fedoraproject.org/fedora:38
+    NAME: fedora-38
 
 
-x86_64-fedora-38-prebuilt-env:
+x86_64-fedora-39-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
-    - job: x86_64-fedora-38-container
+    - job: x86_64-fedora-39-container
       optional: true
   allow_failure: false
   variables:
     CLIPPY: enable
     DOC: enable
-    NAME: fedora-38
+    NAME: fedora-39
 
-x86_64-fedora-38-local-env:
+x86_64-fedora-39-local-env:
   extends: .native_build_job_local_env
   needs: []
   allow_failure: false
   variables:
     CLIPPY: enable
     DOC: enable
-    IMAGE: registry.fedoraproject.org/fedora:38
-    NAME: fedora-38
+    IMAGE: registry.fedoraproject.org/fedora:39
+    NAME: fedora-39
 
 
 x86_64-fedora-rawhide-prebuilt-env:

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
@@ -49,18 +49,18 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-37-container:
+x86_64-fedora-38-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-37
+    NAME: fedora-38
 
 
-x86_64-fedora-38-container:
+x86_64-fedora-39-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-38
+    NAME: fedora-39
 
 
 x86_64-fedora-rawhide-container:

diff --git a/ci/manifest.yml b/ci/manifest.yml
@@ -35,9 +35,9 @@ targets:
       - arch: x86_64
         allow-failure: true
 
-  fedora-37: x86_64
+  fedora-38: x86_64
 
-  fedora-38:
+  fedora-39:
     jobs:
       - arch: x86_64
         variables: