7:06 a.m.
Various workarounds that are necessary due to breakages in external
services and distribution archives, plus fixes for a couple of issues
that were discovered in the process.
Andrea Bolognani (6):
ci: Shuffle cross-building jobs around
ci: Mark container build jobs as required/optional correctly
ci: Move ppc64le build from Debian sid to Debian 10
ci: Refresh Dockerfiles
ci: Add temporary workaround for Fedora Rawhide
ci: Build on FreeBSD 12.2
.gitlab-ci.yml | 66 +++++++++----------
ci/containers/ci-centos-7.Dockerfile | 3 +-
ci/containers/ci-centos-8.Dockerfile | 3 +-
ci/containers/ci-centos-stream.Dockerfile | 3 +-
.../ci-debian-10-cross-aarch64.Dockerfile | 3 +-
.../ci-debian-10-cross-armv6l.Dockerfile | 3 +-
.../ci-debian-10-cross-armv7l.Dockerfile | 3 +-
.../ci-debian-10-cross-i686.Dockerfile | 3 +-
.../ci-debian-10-cross-mips.Dockerfile | 3 +-
.../ci-debian-10-cross-mips64el.Dockerfile | 3 +-
.../ci-debian-10-cross-mipsel.Dockerfile | 3 +-
.../ci-debian-10-cross-ppc64le.Dockerfile | 3 +-
.../ci-debian-10-cross-s390x.Dockerfile | 3 +-
ci/containers/ci-debian-10.Dockerfile | 3 +-
.../ci-debian-sid-cross-aarch64.Dockerfile | 3 +-
.../ci-debian-sid-cross-armv6l.Dockerfile | 3 +-
.../ci-debian-sid-cross-armv7l.Dockerfile | 3 +-
.../ci-debian-sid-cross-i686.Dockerfile | 3 +-
.../ci-debian-sid-cross-mips64el.Dockerfile | 3 +-
.../ci-debian-sid-cross-mipsel.Dockerfile | 3 +-
.../ci-debian-sid-cross-ppc64le.Dockerfile | 3 +-
.../ci-debian-sid-cross-s390x.Dockerfile | 3 +-
ci/containers/ci-debian-sid.Dockerfile | 3 +-
ci/containers/ci-fedora-32.Dockerfile | 3 +-
ci/containers/ci-fedora-33.Dockerfile | 3 +-
...ci-fedora-rawhide-cross-mingw32.Dockerfile | 6 +-
...ci-fedora-rawhide-cross-mingw64.Dockerfile | 6 +-
ci/containers/ci-fedora-rawhide.Dockerfile | 6 +-
ci/containers/ci-opensuse-152.Dockerfile | 3 +-
ci/containers/ci-ubuntu-1804.Dockerfile | 3 +-
ci/containers/ci-ubuntu-2004.Dockerfile | 3 +-
31 files changed, 99 insertions(+), 66 deletions(-)
--
2.26.2
7:06 a.m.
New subject: [libvirt PATCH 1/6] ci: Shuffle cross-building jobs around
Keep them ordered by architecture, the same way the corresponding
container jobs are, to make it easier to jump between the two
sections and compare them.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5779b1b8b2..4f6cd60d51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -435,6 +435,14 @@ x64-macos-1015-build:
# Cross compiled build jobs
+aarch64-debian-10:
+ extends: .cross_build_job
+ needs:
+ - aarch64-debian-10-container
+ variables:
+ NAME: debian-10
+ CROSS: aarch64
+
armv6l-debian-10:
extends: .cross_build_job
needs:
@@ -451,13 +459,13 @@ armv7l-debian-10:
NAME: debian-10
CROSS: armv7l
-mips64el-debian-10:
+i686-debian-sid:
extends: .cross_build_job
needs:
- - mips64el-debian-10-container
+ - i686-debian-sid-container
variables:
- NAME: debian-10
- CROSS: mips64el
+ NAME: debian-sid
+ CROSS: i686
mips-debian-10:
extends: .cross_build_job
@@ -467,13 +475,13 @@ mips-debian-10:
NAME: debian-10
CROSS: mips
-aarch64-debian-10:
+mips64el-debian-10:
extends: .cross_build_job
needs:
- - aarch64-debian-10-container
+ - mips64el-debian-10-container
variables:
NAME: debian-10
- CROSS: aarch64
+ CROSS: mips64el
mipsel-debian-10:
extends: .cross_build_job
@@ -483,29 +491,21 @@ mipsel-debian-10:
NAME: debian-10
CROSS: mipsel
-s390x-debian-sid:
- extends: .cross_build_job
- needs:
- - s390x-debian-sid-container
- variables:
- NAME: debian-sid
- CROSS: s390x
-
-i686-debian-sid:
+ppc64le-debian-sid:
extends: .cross_build_job
needs:
- - i686-debian-sid-container
+ - ppc64le-debian-sid-container
variables:
NAME: debian-sid
- CROSS: i686
+ CROSS: ppc64le
-ppc64le-debian-sid:
+s390x-debian-sid:
extends: .cross_build_job
needs:
- - ppc64le-debian-sid-container
+ - s390x-debian-sid-container
variables:
NAME: debian-sid
- CROSS: ppc64le
+ CROSS: s390x
mingw32-fedora-rawhide:
extends: .cross_build_job
--
2.26.2
8:33 a.m.
New subject: [libvirt PATCH 1/6] ci: Shuffle cross-building jobs around
On Thu, Feb 11, 2021 at 02:06:41PM +0100, Andrea Bolognani wrote:
Keep them ordered by architecture, the same way the corresponding
container jobs are, to make it easier to jump between the two
sections and compare them.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
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 :|
7:06 a.m.
New subject: [libvirt PATCH 2/6] ci: Mark container build jobs as required/optional correctly
Whether a container build job is considered required depends on
whether the corresponding cross-build job exists, and in a few
cases the two got out of sync over time.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f6cd60d51..cd7282a385 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,7 +201,7 @@ armv6l-debian-10-container:
NAME: debian-10-cross-armv6l
armv7l-debian-10-container:
- extends: .container_optional_job
+ extends: .container_job
variables:
NAME: debian-10-cross-armv7l
@@ -246,7 +246,7 @@ armv6l-debian-sid-container:
NAME: debian-sid-cross-armv6l
armv7l-debian-sid-container:
- extends: .container_job
+ extends: .container_optional_job
variables:
NAME: debian-sid-cross-armv7l
@@ -271,7 +271,7 @@ ppc64le-debian-sid-container:
NAME: debian-sid-cross-ppc64le
s390x-debian-sid-container:
- extends: .container_optional_job
+ extends: .container_job
variables:
NAME: debian-sid-cross-s390x
--
2.26.2
8:45 a.m.
New subject: [libvirt PATCH 2/6] ci: Mark container build jobs as required/optional correctly
On Thu, Feb 11, 2021 at 02:06:42PM +0100, Andrea Bolognani wrote:
Whether a container build job is considered required depends on
whether the corresponding cross-build job exists, and in a few
cases the two got out of sync over time.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
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 :|
7:06 a.m.
New subject: [libvirt PATCH 3/6] ci: Move ppc64le build from Debian sid to Debian 10
Debian sid is currently broken on ppc64le, so move the build to
Debian 10; do the opposite for the aarch64 and mips64el builds to
try and restore the 10/sid balance.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd7282a385..bb1d4d46b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -191,7 +191,7 @@ x64-ubuntu-2004-container:
# Cross-build containers build jobs
aarch64-debian-10-container:
- extends: .container_job
+ extends: .container_optional_job
variables:
NAME: debian-10-cross-aarch64
@@ -216,7 +216,7 @@ mips-debian-10-container:
NAME: debian-10-cross-mips
mips64el-debian-10-container:
- extends: .container_job
+ extends: .container_optional_job
variables:
NAME: debian-10-cross-mips64el
@@ -226,7 +226,7 @@ mipsel-debian-10-container:
NAME: debian-10-cross-mipsel
ppc64le-debian-10-container:
- extends: .container_optional_job
+ extends: .container_job
variables:
NAME: debian-10-cross-ppc64le
@@ -236,7 +236,7 @@ s390x-debian-10-container:
NAME: debian-10-cross-s390x
aarch64-debian-sid-container:
- extends: .container_optional_job
+ extends: .container_job
variables:
NAME: debian-sid-cross-aarch64
@@ -256,7 +256,7 @@ i686-debian-sid-container:
NAME: debian-sid-cross-i686
mips64el-debian-sid-container:
- extends: .container_optional_job
+ extends: .container_job
variables:
NAME: debian-sid-cross-mips64el
@@ -266,7 +266,7 @@ mipsel-debian-sid-container:
NAME: debian-sid-cross-mipsel
ppc64le-debian-sid-container:
- extends: .container_job
+ extends: .container_optional_job
variables:
NAME: debian-sid-cross-ppc64le
@@ -435,12 +435,12 @@ x64-macos-1015-build:
# Cross compiled build jobs
-aarch64-debian-10:
+aarch64-debian-sid:
extends: .cross_build_job
needs:
- - aarch64-debian-10-container
+ - aarch64-debian-sid-container
variables:
- NAME: debian-10
+ NAME: debian-sid
CROSS: aarch64
armv6l-debian-10:
@@ -475,12 +475,12 @@ mips-debian-10:
NAME: debian-10
CROSS: mips
-mips64el-debian-10:
+mips64el-debian-sid:
extends: .cross_build_job
needs:
- - mips64el-debian-10-container
+ - mips64el-debian-sid-container
variables:
- NAME: debian-10
+ NAME: debian-sid
CROSS: mips64el
mipsel-debian-10:
@@ -491,12 +491,12 @@ mipsel-debian-10:
NAME: debian-10
CROSS: mipsel
-ppc64le-debian-sid:
+ppc64le-debian-10:
extends: .cross_build_job
needs:
- - ppc64le-debian-sid-container
+ - ppc64le-debian-10-container
variables:
- NAME: debian-sid
+ NAME: debian-10
CROSS: ppc64le
s390x-debian-sid:
--
2.26.2
8:45 a.m.
New subject: [libvirt PATCH 3/6] ci: Move ppc64le build from Debian sid to Debian 10
On Thu, Feb 11, 2021 at 02:06:43PM +0100, Andrea Bolognani wrote:
Debian sid is currently broken on ppc64le, so move the build to
Debian 10; do the opposite for the aarch64 and mips64el builds to
try and restore the 10/sid balance.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
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 :|
7:06 a.m.
New subject: [libvirt PATCH 4/6] ci: Refresh Dockerfiles
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/containers/ci-centos-7.Dockerfile | 3 ++-
ci/containers/ci-centos-8.Dockerfile | 3 ++-
ci/containers/ci-centos-stream.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-aarch64.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-armv6l.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-armv7l.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-i686.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-mips.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-mips64el.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-mipsel.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-ppc64le.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-s390x.Dockerfile | 3 ++-
ci/containers/ci-debian-10.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-aarch64.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-armv6l.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-armv7l.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-i686.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-mips64el.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-mipsel.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-s390x.Dockerfile | 3 ++-
ci/containers/ci-debian-sid.Dockerfile | 3 ++-
ci/containers/ci-fedora-32.Dockerfile | 3 ++-
ci/containers/ci-fedora-33.Dockerfile | 3 ++-
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 ++-
ci/containers/ci-opensuse-152.Dockerfile | 3 ++-
ci/containers/ci-ubuntu-1804.Dockerfile | 3 ++-
ci/containers/ci-ubuntu-2004.Dockerfile | 3 ++-
30 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile
index a847e9135b..233b99c38b 100644
--- a/ci/containers/ci-centos-7.Dockerfile
+++ b/ci/containers/ci-centos-7.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile centos-7 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/centos:7
RUN yum update -y && \
@@ -65,6 +65,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
glusterfs-api-devel \
gnutls-devel \
iproute \
+ iptables \
iscsi-initiator-utils \
kmod \
libacl-devel \
diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile
index 5b81fb8f27..ee7941d87c 100644
--- a/ci/containers/ci-centos-8.Dockerfile
+++ b/ci/containers/ci-centos-8.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile centos-8 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/centos:8
RUN dnf update -y && \
@@ -37,6 +37,7 @@ RUN dnf update -y && \
gnutls-devel \
iproute \
iproute-tc \
+ iptables \
iscsi-initiator-utils \
kmod \
libacl-devel \
diff --git a/ci/containers/ci-centos-stream.Dockerfile
b/ci/containers/ci-centos-stream.Dockerfile
index e286857e00..c090a2ca94 100644
--- a/ci/containers/ci-centos-stream.Dockerfile
+++ b/ci/containers/ci-centos-stream.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile centos-stream libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/centos:8
RUN dnf install -y centos-release-stream && \
@@ -39,6 +39,7 @@ RUN dnf install -y centos-release-stream && \
gnutls-devel \
iproute \
iproute-tc \
+ iptables \
iscsi-initiator-utils \
kmod \
libacl-devel \
diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile
b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile
index 53a3e42951..cc92e04c87 100644
--- a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross aarch64 debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile
b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile
index b99bc0c853..6bd6985472 100644
--- a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv6l debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile
b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile
index 7ad2c122d5..280916553c 100644
--- a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv7l debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-i686.Dockerfile
b/ci/containers/ci-debian-10-cross-i686.Dockerfile
index 8e023b1aa4..32e09161a1 100644
--- a/ci/containers/ci-debian-10-cross-i686.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-i686.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross i686 debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-mips.Dockerfile
b/ci/containers/ci-debian-10-cross-mips.Dockerfile
index 79954dc8be..08e1d9c99b 100644
--- a/ci/containers/ci-debian-10-cross-mips.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-mips.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mips debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile
b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile
index ac174672f7..76363b2e3f 100644
--- a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mips64el debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile
b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile
index 5c38e61d73..cf381efec6 100644
--- a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mipsel debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile
b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile
index 4d60233318..d0464b160c 100644
--- a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross ppc64le debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10-cross-s390x.Dockerfile
b/ci/containers/ci-debian-10-cross-s390x.Dockerfile
index 8dcac833fb..bf4e3225e2 100644
--- a/ci/containers/ci-debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/ci-debian-10-cross-s390x.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross s390x debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-10.Dockerfile
b/ci/containers/ci-debian-10.Dockerfile
index 4f3224e7bd..637b14ea29 100644
--- a/ci/containers/ci-debian-10.Dockerfile
+++ b/ci/containers/ci-debian-10.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libacl1-dev \
libapparmor-dev \
diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile
b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile
index c4db98640b..6adb7cf55a 100644
--- a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross aarch64 debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile
b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile
index 34f60c19dd..5064c48f15 100644
--- a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv6l debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile
b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile
index 840938329e..990b372270 100644
--- a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv7l debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid-cross-i686.Dockerfile
b/ci/containers/ci-debian-sid-cross-i686.Dockerfile
index 5c9022c0bd..927f2ce532 100644
--- a/ci/containers/ci-debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-i686.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross i686 debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile
b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile
index 62661f7023..ca3d465162 100644
--- a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mips64el debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile
b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile
index cc27326557..4868f0aec1 100644
--- a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mipsel debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile
b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile
index 361062bdd7..76354c3d38 100644
--- a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross ppc64le debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile
b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile
index 8264a982eb..b83d804f03 100644
--- a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross s390x debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libc-dev-bin \
libxml2-utils \
diff --git a/ci/containers/ci-debian-sid.Dockerfile
b/ci/containers/ci-debian-sid.Dockerfile
index 33445d3a8d..1b89aad267 100644
--- a/ci/containers/ci-debian-sid.Dockerfile
+++ b/ci/containers/ci-debian-sid.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libacl1-dev \
libapparmor-dev \
diff --git a/ci/containers/ci-fedora-32.Dockerfile
b/ci/containers/ci-fedora-32.Dockerfile
index 3a10d98e8a..6260b0fbd4 100644
--- a/ci/containers/ci-fedora-32.Dockerfile
+++ b/ci/containers/ci-fedora-32.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile fedora-32 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM registry.fedoraproject.org/fedora:32
RUN dnf install -y nosync && \
@@ -44,6 +44,7 @@ exec "$@"' > /usr/bin/nosync && \
gnutls-devel \
iproute \
iproute-tc \
+ iptables \
iscsi-initiator-utils \
kmod \
libacl-devel \
diff --git a/ci/containers/ci-fedora-33.Dockerfile
b/ci/containers/ci-fedora-33.Dockerfile
index 608ec40593..f0c9dca0a9 100644
--- a/ci/containers/ci-fedora-33.Dockerfile
+++ b/ci/containers/ci-fedora-33.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile fedora-33 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM registry.fedoraproject.org/fedora:33
RUN dnf install -y nosync && \
@@ -44,6 +44,7 @@ exec "$@"' > /usr/bin/nosync && \
gnutls-devel \
iproute \
iproute-tc \
+ iptables \
iscsi-initiator-utils \
kmod \
libacl-devel \
diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
index 6b4cbc7ec3..553dfd47f0 100644
--- a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf install -y nosync && \
@@ -32,6 +32,7 @@ exec "$@"' > /usr/bin/nosync && \
glibc-langpack-en \
iproute \
iproute-tc \
+ iptables \
iscsi-initiator-utils \
kmod \
libwsman-devel \
diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
index 4685566e85..0183b15b28 100644
--- a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf install -y nosync && \
@@ -32,6 +32,7 @@ exec "$@"' > /usr/bin/nosync && \
glibc-langpack-en \
iproute \
iproute-tc \
+ iptables \
iscsi-initiator-utils \
kmod \
libwsman-devel \
diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile
b/ci/containers/ci-fedora-rawhide.Dockerfile
index f4b7029919..f331c8d74c 100644
--- a/ci/containers/ci-fedora-rawhide.Dockerfile
+++ b/ci/containers/ci-fedora-rawhide.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile fedora-rawhide libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf install -y nosync && \
@@ -45,6 +45,7 @@ exec "$@"' > /usr/bin/nosync && \
gnutls-devel \
iproute \
iproute-tc \
+ iptables \
iscsi-initiator-utils \
kmod \
libacl-devel \
diff --git a/ci/containers/ci-opensuse-152.Dockerfile
b/ci/containers/ci-opensuse-152.Dockerfile
index 00ea8ff9c4..3512dda5ec 100644
--- a/ci/containers/ci-opensuse-152.Dockerfile
+++ b/ci/containers/ci-opensuse-152.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile opensuse-152 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM registry.opensuse.org/opensuse/leap:15.2
RUN zypper update -y && \
@@ -32,6 +32,7 @@ RUN zypper update -y && \
glibc-locale \
glusterfs-devel \
iproute2 \
+ iptables \
kmod \
libacl-devel \
libapparmor-devel \
diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile
b/ci/containers/ci-ubuntu-1804.Dockerfile
index 8b1d1bddd9..cdd7d00e50 100644
--- a/ci/containers/ci-ubuntu-1804.Dockerfile
+++ b/ci/containers/ci-ubuntu-1804.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile ubuntu-1804 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/ubuntu:18.04
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -26,6 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
glusterfs-common \
iproute2 \
+ iptables \
kmod \
libacl1-dev \
libapparmor-dev \
diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile
b/ci/containers/ci-ubuntu-2004.Dockerfile
index a4ca3d9809..506c800b11 100644
--- a/ci/containers/ci-ubuntu-2004.Dockerfile
+++ b/ci/containers/ci-ubuntu-2004.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile ubuntu-2004 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/740f5254f607de914a92d66419...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/824b894aa3ca40e9d2807b6937...
FROM docker.io/library/ubuntu:20.04
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \
git \
iproute2 \
+ iptables \
kmod \
libacl1-dev \
libapparmor-dev \
--
2.26.2
8:46 a.m.
New subject: [libvirt PATCH 4/6] ci: Refresh Dockerfiles
On Thu, Feb 11, 2021 at 02:06:44PM +0100, Andrea Bolognani wrote:
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/containers/ci-centos-7.Dockerfile | 3 ++-
ci/containers/ci-centos-8.Dockerfile | 3 ++-
ci/containers/ci-centos-stream.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-aarch64.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-armv6l.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-armv7l.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-i686.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-mips.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-mips64el.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-mipsel.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-ppc64le.Dockerfile | 3 ++-
ci/containers/ci-debian-10-cross-s390x.Dockerfile | 3 ++-
ci/containers/ci-debian-10.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-aarch64.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-armv6l.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-armv7l.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-i686.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-mips64el.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-mipsel.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile | 3 ++-
ci/containers/ci-debian-sid-cross-s390x.Dockerfile | 3 ++-
ci/containers/ci-debian-sid.Dockerfile | 3 ++-
ci/containers/ci-fedora-32.Dockerfile | 3 ++-
ci/containers/ci-fedora-33.Dockerfile | 3 ++-
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 ++-
ci/containers/ci-opensuse-152.Dockerfile | 3 ++-
ci/containers/ci-ubuntu-1804.Dockerfile | 3 ++-
ci/containers/ci-ubuntu-2004.Dockerfile | 3 ++-
30 files changed, 60 insertions(+), 30 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
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 :|
7:06 a.m.
New subject: [libvirt PATCH 5/6] 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>
---
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/824b894aa3ca40e9d2807b6937...
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/824b894aa3ca40e9d2807b6937...
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/824b894aa3ca40e9d2807b6937...
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
8:48 a.m.
New subject: [libvirt PATCH 5/6] ci: Add temporary workaround for Fedora Rawhide
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(a)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/824b894aa3ca40e9d2807b6937...
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/824b894aa3ca40e9d2807b6937...
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/824b894aa3ca40e9d2807b6937...
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 :|
9:07 a.m.
New subject: [libvirt PATCH 5/6] ci: Add temporary workaround for Fedora Rawhide
On Thu, 2021-02-11 at 14:48 +0000, Daniel P. Berrangé wrote:
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.
Yeah, I thought of that as well at first, and it's definitely
something that we need to fix in lcitool. I'll post a patch later.
That said, in this case the problem can't be solved by simply
inverting the commands: from the output above, you'll see that the
signing key for Fedora 35 is already present on the system; however,
since the RPMs that are currently in the Rawhide repos are still
signed with the Fedora 34 key, we need to convince dnf to use the
latter for validation. That's what the hack in this patch does.
--
Andrea Bolognani / Red Hat / Virtualization
7:06 a.m.
New subject: [libvirt PATCH 6/6] ci: Build on FreeBSD 12.2
The FreeBSD 12.1 image on Cirrus CI is currently broken, but
that's okay because a FreeBSD 12.2 image is also available and
we'd rather build on the more up-to-date target anyway.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb1d4d46b5..4563bccdf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -418,7 +418,7 @@ x64-freebsd-12-build:
NAME: freebsd-12
CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
CIRRUS_VM_IMAGE_SELECTOR: image_family
- CIRRUS_VM_IMAGE_NAME: freebsd-12-1
+ CIRRUS_VM_IMAGE_NAME: freebsd-12-2
INSTALL_COMMAND: pkg install -y
x64-macos-1015-build:
--
2.26.2
1380
days inactive
1380
days old
12 comments
2 participants
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé