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> - Replace Alpine 3.21 with 3.22 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1860029940 ci/buildenv/{alpine-321.sh => alpine-322.sh} | 0 .../{alpine-321.Dockerfile => alpine-322.Dockerfile} | 2 +- ci/gitlab/builds.yml | 8 ++++---- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename ci/buildenv/{alpine-321.sh => alpine-322.sh} (100%) rename ci/containers/{alpine-321.Dockerfile => alpine-322.Dockerfile} (98%) diff --git a/ci/buildenv/alpine-321.sh b/ci/buildenv/alpine-322.sh similarity index 100% rename from ci/buildenv/alpine-321.sh rename to ci/buildenv/alpine-322.sh diff --git a/ci/containers/alpine-321.Dockerfile b/ci/containers/alpine-322.Dockerfile similarity index 98% rename from ci/containers/alpine-321.Dockerfile rename to ci/containers/alpine-322.Dockerfile index XXXXXXX..XXXXXXX 100644 --- a/ci/containers/alpine-321.Dockerfile +++ b/ci/containers/alpine-322.Dockerfile @@ -XXX,XX +XXX,XX @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.21 +FROM docker.io/library/alpine:3.22 RUN apk update && \ apk upgrade && \ 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-almalinux-9-clang: TARGET_BASE_IMAGE: docker.io/library/almalinux:9 -x86_64-alpine-321: +x86_64-alpine-322: extends: .native_build_job needs: - - job: x86_64-alpine-321-container + - job: x86_64-alpine-322-container optional: true allow_failure: false variables: - NAME: alpine-321 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.21 + NAME: alpine-322 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.22 x86_64-alpine-edge: 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-almalinux-9-container: NAME: almalinux-9 -x86_64-alpine-321-container: +x86_64-alpine-322-container: extends: .container_job allow_failure: false variables: - NAME: alpine-321 + NAME: alpine-322 x86_64-alpine-edge-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: RPM: skip CC: clang - alpine-321: x86_64 + alpine-322: x86_64 alpine-edge: jobs: -- 2.49.0