From: Michal Privoznik Date: Thu, 15 May 2025 12:09:09 +0000 (+0200) Subject: ci: refresh with 'lcitool manifest' X-Git-Tag: v11.4.0-rc1~64 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37ce03c6fe465e476e7195bf46ef5b8473b7844c;p=thirdparty%2Flibvirt.git ci: refresh with 'lcitool manifest' - Add Fedora 42 - Remove EOL Fedora 40 - Switch mingw from Fedora 41 to Fedora 42 Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- diff --git a/ci/buildenv/fedora-41-cross-mingw32.sh b/ci/buildenv/fedora-42-cross-mingw32.sh similarity index 100% rename from ci/buildenv/fedora-41-cross-mingw32.sh rename to ci/buildenv/fedora-42-cross-mingw32.sh diff --git a/ci/buildenv/fedora-41-cross-mingw64.sh b/ci/buildenv/fedora-42-cross-mingw64.sh similarity index 100% rename from ci/buildenv/fedora-41-cross-mingw64.sh rename to ci/buildenv/fedora-42-cross-mingw64.sh diff --git a/ci/buildenv/fedora-40.sh b/ci/buildenv/fedora-42.sh similarity index 97% rename from ci/buildenv/fedora-40.sh rename to ci/buildenv/fedora-42.sh index e45ac2230f..c32a689fbd 100644 --- a/ci/buildenv/fedora-40.sh +++ b/ci/buildenv/fedora-42.sh @@ -9,7 +9,7 @@ function install_buildenv() { dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -82,6 +82,7 @@ function install_buildenv() { systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED diff --git a/ci/containers/fedora-41-cross-mingw32.Dockerfile b/ci/containers/fedora-42-cross-mingw32.Dockerfile similarity index 98% rename from ci/containers/fedora-41-cross-mingw32.Dockerfile rename to ci/containers/fedora-42-cross-mingw32.Dockerfile index 6ab14be6fc..5689128ed9 100644 --- a/ci/containers/fedora-41-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-42-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:41 +FROM registry.fedoraproject.org/fedora:42 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/containers/fedora-41-cross-mingw64.Dockerfile b/ci/containers/fedora-42-cross-mingw64.Dockerfile similarity index 98% rename from ci/containers/fedora-41-cross-mingw64.Dockerfile rename to ci/containers/fedora-42-cross-mingw64.Dockerfile index a0ec65d74a..dff7d84fa3 100644 --- a/ci/containers/fedora-41-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-42-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:41 +FROM registry.fedoraproject.org/fedora:42 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/containers/fedora-40.Dockerfile b/ci/containers/fedora-42.Dockerfile similarity index 96% rename from ci/containers/fedora-40.Dockerfile rename to ci/containers/fedora-42.Dockerfile index b82a975bdb..a59c7beb41 100644 --- a/ci/containers/fedora-40.Dockerfile +++ b/ci/containers/fedora-42.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:42 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -93,6 +93,7 @@ exec "$@"\n' > /usr/bin/nosync && \ systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel && \ nosync dnf autoremove -y && \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 893843cb64..5fab2008d8 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -103,30 +103,30 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-40: +x86_64-fedora-41: extends: .native_build_job needs: - - job: x86_64-fedora-40-container + - job: x86_64-fedora-41-container optional: true allow_failure: false variables: - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 artifacts: expire_in: 1 day paths: - libvirt-rpms -x86_64-fedora-41: +x86_64-fedora-42: extends: .native_build_job needs: - - job: x86_64-fedora-41-container + - job: x86_64-fedora-42-container optional: true allow_failure: false variables: - NAME: fedora-41 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 + NAME: fedora-42 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 artifacts: expire_in: 1 day paths: @@ -416,29 +416,29 @@ s390x-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-41: +mingw32-fedora-42: extends: .cross_build_job needs: - - job: mingw32-fedora-41-container + - job: mingw32-fedora-42-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-41 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 + NAME: fedora-42 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 -mingw64-fedora-41: +mingw64-fedora-42: extends: .cross_build_job needs: - - job: mingw64-fedora-41-container + - job: mingw64-fedora-42-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-41 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 + NAME: fedora-42 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 mingw32-fedora-rawhide: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index f88a39a1f8..05809fbdeb 100644 --- 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-40-container: +x86_64-fedora-41-container: extends: .container_job allow_failure: false variables: - NAME: fedora-40 + NAME: fedora-41 -x86_64-fedora-41-container: +x86_64-fedora-42-container: extends: .container_job allow_failure: false variables: - NAME: fedora-41 + NAME: fedora-42 x86_64-fedora-rawhide-container: @@ -220,19 +220,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-41-container: +mingw32-fedora-42-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-41-cross-mingw32 + NAME: fedora-42-cross-mingw32 -mingw64-fedora-41-container: +mingw64-fedora-42-container: extends: .container_job allow_failure: false variables: - NAME: fedora-41-cross-mingw64 + NAME: fedora-42-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 3b06f4827e..14bfef25d2 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -104,7 +104,7 @@ targets: containers: false builds: false - fedora-40: + fedora-41: jobs: - arch: x86_64 artifacts: @@ -112,7 +112,7 @@ targets: paths: - libvirt-rpms - fedora-41: + fedora-42: jobs: - arch: x86_64 artifacts: