From: Michal Privoznik <[email protected]> - Add Fedora 43 - Remove EOL Fedora 41 - Switch mingw from Fedora 42 to Fedora 43 - Switch integration tests from Fedora 41 to Fedora 43
Signed-off-by: Michal Privoznik <[email protected]> --- Depends on the following MRs: https://gitlab.com/libvirt/libvirt-python/-/merge_requests/181 https://gitlab.com/libvirt/libvirt-perl/-/merge_requests/141 Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/2172379522 ...-mingw32.sh => fedora-43-cross-mingw32.sh} | 0 ...-mingw64.sh => fedora-43-cross-mingw64.sh} | 0 ci/buildenv/{fedora-41.sh => fedora-43.sh} | 0 ...ile => fedora-43-cross-mingw32.Dockerfile} | 2 +- ...ile => fedora-43-cross-mingw64.Dockerfile} | 2 +- ...ora-41.Dockerfile => fedora-43.Dockerfile} | 2 +- ci/gitlab/builds.yml | 46 +++++++++---------- ci/gitlab/containers.yml | 22 ++++----- ci/integration.yml | 20 ++++---- ci/manifest.yml | 16 +++---- 10 files changed, 55 insertions(+), 55 deletions(-) rename ci/buildenv/{fedora-42-cross-mingw32.sh => fedora-43-cross-mingw32.sh} (100%) rename ci/buildenv/{fedora-42-cross-mingw64.sh => fedora-43-cross-mingw64.sh} (100%) rename ci/buildenv/{fedora-41.sh => fedora-43.sh} (100%) rename ci/containers/{fedora-42-cross-mingw32.Dockerfile => fedora-43-cross-mingw32.Dockerfile} (98%) rename ci/containers/{fedora-42-cross-mingw64.Dockerfile => fedora-43-cross-mingw64.Dockerfile} (98%) rename ci/containers/{fedora-41.Dockerfile => fedora-43.Dockerfile} (98%) diff --git a/ci/buildenv/fedora-42-cross-mingw32.sh b/ci/buildenv/fedora-43-cross-mingw32.sh similarity index 100% rename from ci/buildenv/fedora-42-cross-mingw32.sh rename to ci/buildenv/fedora-43-cross-mingw32.sh diff --git a/ci/buildenv/fedora-42-cross-mingw64.sh b/ci/buildenv/fedora-43-cross-mingw64.sh similarity index 100% rename from ci/buildenv/fedora-42-cross-mingw64.sh rename to ci/buildenv/fedora-43-cross-mingw64.sh diff --git a/ci/buildenv/fedora-41.sh b/ci/buildenv/fedora-43.sh similarity index 100% rename from ci/buildenv/fedora-41.sh rename to ci/buildenv/fedora-43.sh diff --git a/ci/containers/fedora-42-cross-mingw32.Dockerfile b/ci/containers/fedora-43-cross-mingw32.Dockerfile similarity index 98% rename from ci/containers/fedora-42-cross-mingw32.Dockerfile rename to ci/containers/fedora-43-cross-mingw32.Dockerfile index 94d9378850..de7bee20e1 100644 --- a/ci/containers/fedora-42-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-43-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:42 +FROM registry.fedoraproject.org/fedora:43 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/containers/fedora-42-cross-mingw64.Dockerfile b/ci/containers/fedora-43-cross-mingw64.Dockerfile similarity index 98% rename from ci/containers/fedora-42-cross-mingw64.Dockerfile rename to ci/containers/fedora-43-cross-mingw64.Dockerfile index 9d59a70975..ff6c3f8aa9 100644 --- a/ci/containers/fedora-42-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-43-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:42 +FROM registry.fedoraproject.org/fedora:43 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/containers/fedora-41.Dockerfile b/ci/containers/fedora-43.Dockerfile similarity index 98% rename from ci/containers/fedora-41.Dockerfile rename to ci/containers/fedora-43.Dockerfile index 89732dd529..55f68a5839 100644 --- a/ci/containers/fedora-41.Dockerfile +++ b/ci/containers/fedora-43.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:41 +FROM registry.fedoraproject.org/fedora:43 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index ae691862c2..950b7b9282 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -103,21 +103,6 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-41: - extends: .native_build_job - needs: - - job: x86_64-fedora-41-container - optional: true - allow_failure: false - variables: - NAME: fedora-41 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-fedora-42: extends: .native_build_job needs: @@ -133,6 +118,21 @@ x86_64-fedora-42: - libvirt-rpms +x86_64-fedora-43: + extends: .native_build_job + needs: + - job: x86_64-fedora-43-container + optional: true + allow_failure: false + variables: + NAME: fedora-43 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:43 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide: extends: .native_build_job needs: @@ -416,29 +416,29 @@ s390x-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-42: +mingw32-fedora-43: extends: .cross_build_job needs: - - job: mingw32-fedora-42-container + - job: mingw32-fedora-43-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-42 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 + NAME: fedora-43 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:43 -mingw64-fedora-42: +mingw64-fedora-43: extends: .cross_build_job needs: - - job: mingw64-fedora-42-container + - job: mingw64-fedora-43-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-42 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 + NAME: fedora-43 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:43 mingw32-fedora-rawhide: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 0650e4781c..cd2262e273 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -49,13 +49,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-41-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-41 - - x86_64-fedora-42-container: extends: .container_job allow_failure: false @@ -63,6 +56,13 @@ x86_64-fedora-42-container: NAME: fedora-42 +x86_64-fedora-43-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-43 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -220,19 +220,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-42-container: +mingw32-fedora-43-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-42-cross-mingw32 + NAME: fedora-43-cross-mingw32 -mingw64-fedora-42-container: +mingw64-fedora-43-container: extends: .container_job allow_failure: false variables: - NAME: fedora-42-cross-mingw64 + NAME: fedora-43-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/integration.yml b/ci/integration.yml index 2c5e5a65bc..b7e301b4c0 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -29,23 +29,23 @@ centos-stream-9-tests: # 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-41-tests: +fedora-43-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-41 + DISTRO: fedora-43 # 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-41 + - x86_64-fedora-43 - project: libvirt/libvirt-perl - job: x86_64-fedora-41 + job: x86_64-fedora-43 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-41 + job: x86_64-fedora-43 ref: master artifacts: true @@ -53,22 +53,22 @@ fedora-41-tests: # 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-41-upstream-qemu-tests: +.fedora-43-upstream-qemu-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-41 + DISTRO: fedora-43 # 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-41 + - x86_64-fedora-43 - project: libvirt/libvirt-perl - job: x86_64-fedora-41 + job: x86_64-fedora-43 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-41 + job: x86_64-fedora-43 ref: master artifacts: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 21d570cb00..e41cbfaf62 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -104,14 +104,6 @@ targets: containers: false builds: false - fedora-41: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - fedora-42: jobs: - arch: x86_64 @@ -120,6 +112,14 @@ targets: paths: - libvirt-rpms + fedora-43: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + - arch: mingw32 builds: false -- 2.51.0
