[PATCH v2 07/10] 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(a)redhat.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- ...-mingw32.sh => fedora-40-cross-mingw32.sh} | 0 ...-mingw64.sh => fedora-40-cross-mingw64.sh} | 0 ci/buildenv/{fedora-38.sh => fedora-40.sh} | 0 ...ile => fedora-40-cross-mingw32.Dockerfile} | 2 +- ...ile => fedora-40-cross-mingw64.Dockerfile} | 2 +- ...ora-38.Dockerfile => fedora-40.Dockerfile} | 2 +- ci/gitlab/builds.yml | 46 +++++++++---------- ci/gitlab/containers.yml | 22 ++++----- ci/integration.yml | 24 ---------- ci/manifest.yml | 26 +++++------ 10 files changed, 50 insertions(+), 74 deletions(-) rename ci/buildenv/{fedora-38-cross-mingw32.sh => fedora-40-cross-mingw32.sh} (100%) rename ci/buildenv/{fedora-38-cross-mingw64.sh => fedora-40-cross-mingw64.sh} (100%) rename ci/buildenv/{fedora-38.sh => fedora-40.sh} (100%) rename ci/containers/{fedora-38-cross-mingw32.Dockerfile => fedora-40-cross-mingw32.Dockerfile} (98%) rename ci/containers/{fedora-38-cross-mingw64.Dockerfile => fedora-40-cross-mingw64.Dockerfile} (98%) rename ci/containers/{fedora-38.Dockerfile => fedora-40.Dockerfile} (98%) 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 54eb714505..9721481171 100644 --- 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 7578805c02..f25012abb6 100644 --- 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 fe06346cc6..32a9cdae12 100644 --- 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 6ed5c578dd..7edb0d0712 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -127,21 +127,6 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-38: - extends: .native_build_job - needs: - - job: x86_64-fedora-38-container - optional: true - allow_failure: false - variables: - NAME: fedora-38 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-fedora-39: extends: .native_build_job needs: @@ -157,6 +142,21 @@ x86_64-fedora-39: - libvirt-rpms +x86_64-fedora-40: + extends: .native_build_job + needs: + - job: x86_64-fedora-40-container + optional: true + allow_failure: false + variables: + NAME: fedora-40 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide: extends: .native_build_job needs: @@ -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 c1e7a0a67e..fb153a1234 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -57,13 +57,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-38-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-38 - - x86_64-fedora-39-container: extends: .container_job allow_failure: false @@ -71,6 +64,13 @@ x86_64-fedora-39-container: NAME: fedora-39 +x86_64-fedora-40-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-40 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -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 d3859c54e8..2fc8d02956 100644 --- 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 ab1a2cff30..e78d81f1f4 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -144,19 +144,6 @@ targets: containers: false builds: false - fedora-38: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - - arch: mingw32 - builds: false - - - arch: mingw64 - fedora-39: jobs: - arch: x86_64 @@ -165,6 +152,19 @@ targets: paths: - libvirt-rpms + fedora-40: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + - arch: mingw32 + builds: false + + - arch: mingw64 + fedora-rawhide: jobs: - arch: x86_64 -- 2.43.2