From: Daniel P. Berrangé <berrange@redhat.com> This removes librbd from 32-bit arches on debian sid, which no longer exists. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ci/buildenv/debian-sid-cross-armv6l.sh | 1 - ci/buildenv/debian-sid-cross-armv7l.sh | 1 - ci/buildenv/debian-sid-cross-i686.sh | 1 - ci/containers/debian-sid-cross-armv6l.Dockerfile | 1 - ci/containers/debian-sid-cross-armv7l.Dockerfile | 1 - ci/containers/debian-sid-cross-i686.Dockerfile | 1 - 6 files changed, 6 deletions(-) diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index XXXXXXX..XXXXXXX 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -XXX,XX +XXX,XX @@ function install_buildenv() { libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ - librbd-dev:armel \ libreadline-dev:armel \ libsanlock-dev:armel \ libsasl2-dev:armel \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index XXXXXXX..XXXXXXX 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -XXX,XX +XXX,XX @@ function install_buildenv() { libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ - librbd-dev:armhf \ libreadline-dev:armhf \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index XXXXXXX..XXXXXXX 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -XXX,XX +XXX,XX @@ function install_buildenv() { libparted-dev:i386 \ libpcap0.8-dev:i386 \ libpciaccess-dev:i386 \ - librbd-dev:i386 \ libreadline-dev:i386 \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index XXXXXXX..XXXXXXX 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -XXX,XX +XXX,XX @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ - librbd-dev:armel \ libreadline-dev:armel \ libsanlock-dev:armel \ libsasl2-dev:armel \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index XXXXXXX..XXXXXXX 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -XXX,XX +XXX,XX @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ - librbd-dev:armhf \ libreadline-dev:armhf \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index XXXXXXX..XXXXXXX 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -XXX,XX +XXX,XX @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libparted-dev:i386 \ libpcap0.8-dev:i386 \ libpciaccess-dev:i386 \ - librbd-dev:i386 \ libreadline-dev:i386 \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ -- 2.49.0 From: Michal Privoznik <mprivozn@redhat.com> - Add Fedora 42 - Remove EOL Fedora 40 - Switch mingw from Fedora 41 to Fedora 42 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1819375318 It also contains spec file changes that I'll be sending shortly. I have them all in one branch. ...-mingw32.sh => fedora-42-cross-mingw32.sh} | 0 ...-mingw64.sh => fedora-42-cross-mingw64.sh} | 0 ci/buildenv/{fedora-40.sh => fedora-42.sh} | 3 +- ...ile => fedora-42-cross-mingw32.Dockerfile} | 2 +- ...ile => fedora-42-cross-mingw64.Dockerfile} | 2 +- ...ora-40.Dockerfile => fedora-42.Dockerfile} | 5 +- ci/gitlab/builds.yml | 46 +++++++++---------- ci/gitlab/containers.yml | 22 ++++----- ci/manifest.yml | 16 +++---- 9 files changed, 49 insertions(+), 47 deletions(-) rename ci/buildenv/{fedora-41-cross-mingw32.sh => fedora-42-cross-mingw32.sh} (100%) rename ci/buildenv/{fedora-41-cross-mingw64.sh => fedora-42-cross-mingw64.sh} (100%) rename ci/buildenv/{fedora-40.sh => fedora-42.sh} (97%) rename ci/containers/{fedora-41-cross-mingw32.Dockerfile => fedora-42-cross-mingw32.Dockerfile} (98%) rename ci/containers/{fedora-41-cross-mingw64.Dockerfile => fedora-42-cross-mingw64.Dockerfile} (98%) rename ci/containers/{fedora-40.Dockerfile => fedora-42.Dockerfile} (96%) 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 XXXXXXX..XXXXXXX 100644 --- a/ci/buildenv/fedora-40.sh +++ b/ci/buildenv/fedora-42.sh @@ -XXX,XX +XXX,XX @@ function install_buildenv() { dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644 --- a/ci/containers/fedora-41-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-42-cross-mingw32.Dockerfile @@ -XXX,XX +XXX,XX @@ # # 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 XXXXXXX..XXXXXXX 100644 --- a/ci/containers/fedora-41-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-42-cross-mingw64.Dockerfile @@ -XXX,XX +XXX,XX @@ # # 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 XXXXXXX..XXXXXXX 100644 --- a/ci/containers/fedora-40.Dockerfile +++ b/ci/containers/fedora-42.Dockerfile @@ -XXX,XX +XXX,XX @@ # # 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\ @@ -XXX,XX +XXX,XX @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -XXX,XX +XXX,XX @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -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-41: extends: .native_build_job needs: @@ -XXX,XX +XXX,XX @@ x86_64-fedora-41: - libvirt-rpms +x86_64-fedora-42: + extends: .native_build_job + needs: + - job: x86_64-fedora-42-container + optional: true + allow_failure: false + variables: + NAME: fedora-42 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide: extends: .native_build_job needs: @@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -XXX,XX +XXX,XX @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-40-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-40 - - x86_64-fedora-41-container: extends: .container_job allow_failure: false @@ -XXX,XX +XXX,XX @@ x86_64-fedora-41-container: NAME: fedora-41 +x86_64-fedora-42-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-42 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -XXX,XX +XXX,XX @@ targets: containers: false builds: false - fedora-40: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - fedora-41: jobs: - arch: x86_64 @@ -XXX,XX +XXX,XX @@ targets: paths: - libvirt-rpms + fedora-42: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + - arch: mingw32 builds: false -- 2.49.0