[libvirt PATCH v2 2/3] ci: Add temporary workaround for Fedora Rawhide

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. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- Test pipeline showing that, if this commit is reverted, building the Fedora Rawhide container images still fails even though we're updating fedora-gpg-keys first: https://gitlab.com/abologna/libvirt/-/pipelines/255494585 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 c718778acb..fd03378bdf 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/891c7d56be1d0eb5adaf78fced... FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ +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 update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ echo -e '#!/bin/sh\n\ if test -d /usr/lib64\n\ diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile index 6058d0c0b2..8a66d5e375 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/891c7d56be1d0eb5adaf78fced... FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ +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 update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ echo -e '#!/bin/sh\n\ if test -d /usr/lib64\n\ diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile index 027e8a7c41..fa6a824242 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/891c7d56be1d0eb5adaf78fced... FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ +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 update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ echo -e '#!/bin/sh\n\ if test -d /usr/lib64\n\ -- 2.26.2