ci: Switch from Fedora 38 to Fedora 40

Since Fedora 40 was released recently, Fedora 38 is now
unsupported. Drop Fedora 38 and introduce Fedora 40 to our CI.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/ci/buildenv/fedora-38-cross-mingw32.sh b/ci/buildenv/fedora-40-cross-mingw32.sh
similarity index 100%
rename from ci/buildenv/fedora-38-cross-mingw32.sh
rename to ci/buildenv/fedora-40-cross-mingw32.sh

diff --git a/ci/buildenv/fedora-38-cross-mingw64.sh b/ci/buildenv/fedora-40-cross-mingw64.sh
similarity index 100%
rename from ci/buildenv/fedora-38-cross-mingw64.sh
rename to ci/buildenv/fedora-40-cross-mingw64.sh

diff --git a/ci/buildenv/fedora-38.sh b/ci/buildenv/fedora-40.sh
similarity index 100%
rename from ci/buildenv/fedora-38.sh
rename to ci/buildenv/fedora-40.sh

diff --git a/ci/containers/fedora-38-cross-mingw32.Dockerfile b/ci/containers/fedora-40-cross-mingw32.Dockerfile
similarity index 98%
rename from ci/containers/fedora-38-cross-mingw32.Dockerfile
rename to ci/containers/fedora-40-cross-mingw32.Dockerfile
index 54eb7145056b6d2d422c2ecb9d0e01cb40fc29c9..97214811713d7cba776acc76b44d1ec787ec4d4e 100644 (file)
--- a/ci/containers/fedora-38-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-40-cross-mingw32.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\

diff --git a/ci/containers/fedora-38-cross-mingw64.Dockerfile b/ci/containers/fedora-40-cross-mingw64.Dockerfile
similarity index 98%
rename from ci/containers/fedora-38-cross-mingw64.Dockerfile
rename to ci/containers/fedora-40-cross-mingw64.Dockerfile
index 7578805c026e0cea7c8601b93156eaa33269221f..f25012abb62e93ef6ef460ab403eb4da1ba5ed81 100644 (file)
--- a/ci/containers/fedora-38-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-40-cross-mingw64.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\

diff --git a/ci/containers/fedora-38.Dockerfile b/ci/containers/fedora-40.Dockerfile
similarity index 98%
rename from ci/containers/fedora-38.Dockerfile
rename to ci/containers/fedora-40.Dockerfile
index fe06346cc641a93157d3401cb5b9730bfcb77021..32a9cdae1249a7b07997c95405c7ebc33a8a7bd1 100644 (file)
--- a/ci/containers/fedora-38.Dockerfile
+++ b/ci/containers/fedora-40.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 6ed5c578ddb96449ba3f6bd6d253a9d68a0e1a46..7edb0d0712d1eeb572dc47cef0e96ae27b4210ba 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -127,30 +127,30 @@ x86_64-debian-sid:
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-x86_64-fedora-38:
+x86_64-fedora-39:
   extends: .native_build_job
   needs:
-    - job: x86_64-fedora-38-container
+    - job: x86_64-fedora-39-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-38
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38
+    NAME: fedora-39
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
 
-x86_64-fedora-39:
+x86_64-fedora-40:
   extends: .native_build_job
   needs:
-    - job: x86_64-fedora-39-container
+    - job: x86_64-fedora-40-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-39
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39
+    NAME: fedora-40
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
   artifacts:
     expire_in: 1 day
     paths:
@@ -547,29 +547,29 @@ s390x-debian-sid:
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-mingw32-fedora-38:
+mingw32-fedora-40:
   extends: .cross_build_job
   needs:
-    - job: mingw32-fedora-38-container
+    - job: mingw32-fedora-40-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw32
     JOB_OPTIONAL: 1
-    NAME: fedora-38
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38
+    NAME: fedora-40
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
 
 
-mingw64-fedora-38:
+mingw64-fedora-40:
   extends: .cross_build_job
   needs:
-    - job: mingw64-fedora-38-container
+    - job: mingw64-fedora-40-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw64
-    NAME: fedora-38
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38
+    NAME: fedora-40
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
 
 
 mingw32-fedora-rawhide:

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index c1e7a0a67efd86a4bdff6166883e4e7864979d0a..fb153a12346c85c3d413089d6bf74dacf18e493e 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -57,18 +57,18 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-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-39-container:
+x86_64-fedora-40-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-39
+    NAME: fedora-40
 
 
 x86_64-fedora-rawhide-container:
@@ -292,19 +292,19 @@ s390x-debian-sid-container:
     NAME: debian-sid-cross-s390x
 
 
-mingw32-fedora-38-container:
+mingw32-fedora-40-container:
   extends: .container_job
   allow_failure: false
   variables:
     JOB_OPTIONAL: 1
-    NAME: fedora-38-cross-mingw32
+    NAME: fedora-40-cross-mingw32
 
 
-mingw64-fedora-38-container:
+mingw64-fedora-40-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-38-cross-mingw64
+    NAME: fedora-40-cross-mingw64
 
 
 mingw32-fedora-rawhide-container:

diff --git a/ci/integration.yml b/ci/integration.yml
index d3859c54e839fbfba577a39d2146fb8f7da153b6..2fc8d0295679f29e823bb46326c74690acce8038 100644 (file)
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -25,30 +25,6 @@ centos-stream-9-tests:
       ref: master
       artifacts: true
 
-# NOTE The integration tests use artifacts produced by the libvirt-perl
-# and libvirt-python CI jobs, so the new target needs to be introduced
-# there before it can be used here. The VM template for the target
-# also needs to be created on the runner host.
-fedora-38-tests:
-  extends: .integration_tests
-  variables:
-    # needed by libvirt-gitlab-executor
-    DISTRO: fedora-38
-    # can be overridden in forks to set a different runner tag
-    LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
-  tags:
-    - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
-  needs:
-    - x86_64-fedora-38
-    - project: libvirt/libvirt-perl
-      job: x86_64-fedora-38
-      ref: master
-      artifacts: true
-    - project: libvirt/libvirt-python
-      job: x86_64-fedora-38
-      ref: master
-      artifacts: true
-
 # NOTE The integration tests use artifacts produced by the libvirt-perl
 # and libvirt-python CI jobs, so the new target needs to be introduced
 # there before it can be used here. The VM template for the target

diff --git a/ci/manifest.yml b/ci/manifest.yml
index ab1a2cff30405158e0d75b441072c5225fcc9785..e78d81f1f4b68cf82b835b784bbb697fac675ecd 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -144,7 +144,7 @@ targets:
         containers: false
         builds: false
 
-  fedora-38:
+  fedora-39:
     jobs:
       - arch: x86_64
         artifacts:
@@ -152,12 +152,7 @@ targets:
           paths:
             - libvirt-rpms
 
-      - arch: mingw32
-        builds: false
-
-      - arch: mingw64
-
-  fedora-39:
+  fedora-40:
     jobs:
       - arch: x86_64
         artifacts:
@@ -165,6 +160,11 @@ targets:
           paths:
             - libvirt-rpms
 
+      - arch: mingw32
+        builds: false
+
+      - arch: mingw64
+
   fedora-rawhide:
     jobs:
       - arch: x86_64