[libvirt PATCH 5/6] ci: Add temporary workaround for Fedora Rawhide
Daniel P. Berrangé
berrange at redhat.com
Thu Feb 11 14:48:33 UTC 2021
On Thu, Feb 11, 2021 at 02:06:45PM +0100, Andrea Bolognani wrote:
> The .repo files for Fedora Rawhide are already pointing to the
> Fedora 35 key, but all RPMs are still signed with the Fedora 34
> key, resulting in
>
> GPG key at file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-35-x86_64 (0x9867C58F) is already installed
> The GPG keys listed for the "Fedora - Rawhide - Developmental packages for the next Fedora release" repository
> are already installed but they are not correct for this package.
> Check that the correct key URLs are configured for this repository.. Failing package is: nosync-1.1-10.fc34.x86_64
> GPG Keys are configured as: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-35-x86_64
> The downloaded packages were saved in cache until the next successful transaction.
> You can remove cached packages by executing 'dnf clean packages'.
> Error: GPG check FAILED
>
> Temporarily tweak the .repo files so that the Fedora 34 key is
> used for validation. We should be able to revert this in a few
> days.
Hmm, isn't the real bug the ordering:
dnf install -y nosync && \
nosync dnf update -y --nogpgcheck fedora-gpg-keys && \
nosync dnf update -y && \
We installed nosync too early. We need to update fedora-gpg-keys
as the *first* thing we do in rawhide images, and only then
attempt to install nosync.
>
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
> ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile | 3 ++-
> ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile | 3 ++-
> ci/containers/ci-fedora-rawhide.Dockerfile | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
> index 553dfd47f0..da0a6cc02c 100644
> --- a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
> +++ b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
> @@ -5,7 +5,8 @@
> # https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b693765e213cb8aa832
> FROM registry.fedoraproject.org/fedora:rawhide
>
> -RUN dnf install -y nosync && \
> +RUN sed -Ei 's|^gpgkey=.*$|gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-x86_64|g' /etc/yum.repos.d/*.repo && \
> + dnf install -y nosync && \
> echo -e '#!/bin/sh\n\
> if test -d /usr/lib64\n\
> then\n\
> diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
> index 0183b15b28..a1e50a34b2 100644
> --- a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
> +++ b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
> @@ -5,7 +5,8 @@
> # https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b693765e213cb8aa832
> FROM registry.fedoraproject.org/fedora:rawhide
>
> -RUN dnf install -y nosync && \
> +RUN sed -Ei 's|^gpgkey=.*$|gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-x86_64|g' /etc/yum.repos.d/*.repo && \
> + dnf install -y nosync && \
> echo -e '#!/bin/sh\n\
> if test -d /usr/lib64\n\
> then\n\
> diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile
> index f331c8d74c..e3968b2199 100644
> --- a/ci/containers/ci-fedora-rawhide.Dockerfile
> +++ b/ci/containers/ci-fedora-rawhide.Dockerfile
> @@ -5,7 +5,8 @@
> # https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b693765e213cb8aa832
> FROM registry.fedoraproject.org/fedora:rawhide
>
> -RUN dnf install -y nosync && \
> +RUN sed -Ei 's|^gpgkey=.*$|gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-x86_64|g' /etc/yum.repos.d/*.repo && \
> + dnf install -y nosync && \
> echo -e '#!/bin/sh\n\
> if test -d /usr/lib64\n\
> then\n\
> --
> 2.26.2
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
More information about the libvir-list
mailing list