6:30 a.m.
This is reworked version of
https://listman.redhat.com/archives/libguestfs/2021-March/msg00134.html
with more packages installed so that more code paths are tested, also some fixes
in the code (mostly requirements).
There are still some things that fail.
FreeBSD
=======
The build fails because there is no fallocate() there.
Many platforms (those that have nbd-server in repositories)
===========================================================
interop/interop-nbd-server fails with:
Error: inetd mode requires syslog
Exiting.
which makes sense as it is run with port 0, but how to check for whether it is
compiled with or without syslog (so that we know to skip the test) or whether it
is something else that is missing (capabilities in a container) is beyond me.
interop/list-exports-nbd-server gets stuck and in the CI times out the whole
test suite. Locally I need to manually exec into the container:
podman exec -itu bash
and I see the nbd-server is just not doing anything. After killing it the test
ends and fails. I did not debug nbd-server for this, maybe it is again some
requisite that is missing and we are not checking for it (capability, nbd module
access, etc.), I do not know.
There are also some skips that I did not go into any more after trying to figure
out every "... no" in config.log:
Both interop-qemu-nbd-tls-certs and interop-qemu-nbd-tls-psk get skipped because
they are missing the keys, but I presume those are supposed to be generated.
I think that all these can be figured out after the final patch is merged so
that the CI runs truly automatically. I am posting it for review though as I am
not sure the solutions in first four patches are the preferred ones.
Martin Kletzander (5):
Fix test requirements
Change golang/run_tests.sh shebang to bash
libev: Check for old compiler
golang: Check for module support
Introduction of automated testing
configure.ac | 26 +-
Makefile.am | 1 +
tests/functions.sh.in | 21 +
interop/dirty-bitmap.sh | 4 +-
.gitlab-ci.yml | 479 ++++++++++++++++++
ci/build_script.sh | 43 ++
ci/cirrus/build.yml | 22 +
ci/cirrus/freebsd-12.vars | 14 +
ci/cirrus/freebsd-current.vars | 14 +
ci/cirrus/macos-11.vars | 14 +
ci/cirrus/refresh | 22 +
ci/containers/README.rst | 14 +
ci/containers/centos-8.Dockerfile | 61 +++
ci/containers/centos-stream-8.Dockerfile | 61 +++
.../debian-10-cross-aarch64.Dockerfile | 86 ++++
.../debian-10-cross-armv6l.Dockerfile | 86 ++++
.../debian-10-cross-armv7l.Dockerfile | 86 ++++
ci/containers/debian-10-cross-i686.Dockerfile | 86 ++++
ci/containers/debian-10-cross-mips.Dockerfile | 86 ++++
.../debian-10-cross-mips64el.Dockerfile | 86 ++++
.../debian-10-cross-mipsel.Dockerfile | 86 ++++
.../debian-10-cross-ppc64le.Dockerfile | 86 ++++
.../debian-10-cross-s390x.Dockerfile | 86 ++++
ci/containers/debian-10.Dockerfile | 64 +++
.../debian-sid-cross-aarch64.Dockerfile | 86 ++++
.../debian-sid-cross-armv6l.Dockerfile | 86 ++++
.../debian-sid-cross-armv7l.Dockerfile | 86 ++++
.../debian-sid-cross-i686.Dockerfile | 86 ++++
.../debian-sid-cross-mips64el.Dockerfile | 86 ++++
.../debian-sid-cross-mipsel.Dockerfile | 86 ++++
.../debian-sid-cross-ppc64le.Dockerfile | 86 ++++
.../debian-sid-cross-s390x.Dockerfile | 86 ++++
ci/containers/debian-sid.Dockerfile | 64 +++
ci/containers/fedora-33.Dockerfile | 68 +++
ci/containers/fedora-34.Dockerfile | 68 +++
.../fedora-rawhide-cross-mingw32.Dockerfile | 71 +++
.../fedora-rawhide-cross-mingw64.Dockerfile | 71 +++
ci/containers/fedora-rawhide.Dockerfile | 69 +++
ci/containers/opensuse-leap-152.Dockerfile | 56 ++
ci/containers/opensuse-tumbleweed.Dockerfile | 57 +++
ci/containers/refresh | 42 ++
ci/containers/ubuntu-1804.Dockerfile | 62 +++
ci/containers/ubuntu-2004.Dockerfile | 64 +++
copy/copy-block-to-nbd.sh | 1 +
copy/copy-nbd-to-block.sh | 1 +
copy/copy-nbd-to-nbd.sh | 1 +
copy/copy-nbd-to-small-block-error.sh | 1 +
copy/copy-tls.sh | 1 +
fuse/test-file-mode.sh | 1 +
fuse/test-nbdkit.sh | 1 +
fuse/test-qcow2.sh | 1 +
golang/run-tests.sh | 2 +-
info/info-map-qemu-dirty-bitmap.sh | 4 +-
53 files changed, 3022 insertions(+), 6 deletions(-)
create mode 100644 .gitlab-ci.yml
create mode 100755 ci/build_script.sh
create mode 100644 ci/cirrus/build.yml
create mode 100644 ci/cirrus/freebsd-12.vars
create mode 100644 ci/cirrus/freebsd-current.vars
create mode 100644 ci/cirrus/macos-11.vars
create mode 100755 ci/cirrus/refresh
create mode 100644 ci/containers/README.rst
create mode 100644 ci/containers/centos-8.Dockerfile
create mode 100644 ci/containers/centos-stream-8.Dockerfile
create mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
create mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
create mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
create mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
create mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
create mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
create mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
create mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
create mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
create mode 100644 ci/containers/debian-10.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-aarch64.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-armv6l.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-armv7l.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-i686.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-mips64el.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-mipsel.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-ppc64le.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-s390x.Dockerfile
create mode 100644 ci/containers/debian-sid.Dockerfile
create mode 100644 ci/containers/fedora-33.Dockerfile
create mode 100644 ci/containers/fedora-34.Dockerfile
create mode 100644 ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
create mode 100644 ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
create mode 100644 ci/containers/fedora-rawhide.Dockerfile
create mode 100644 ci/containers/opensuse-leap-152.Dockerfile
create mode 100644 ci/containers/opensuse-tumbleweed.Dockerfile
create mode 100755 ci/containers/refresh
create mode 100644 ci/containers/ubuntu-1804.Dockerfile
create mode 100644 ci/containers/ubuntu-2004.Dockerfile
--
2.31.1
6:30 a.m.
New subject: [libnbd PATCH 1/5] Fix test requirements
Some tests have extra dependencies that may be missing in minimal
deployments (e.g. hexdump), some require kernel modules or support (nbd, fuse)
and others need qemu, but were written to only work with qemu-kvm binary.
All these were fixed to my best knowledge, but of course they are still not
perfect.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/functions.sh.in | 21 +++++++++++++++++++++
interop/dirty-bitmap.sh | 4 ++--
copy/copy-block-to-nbd.sh | 1 +
copy/copy-nbd-to-block.sh | 1 +
copy/copy-nbd-to-nbd.sh | 1 +
copy/copy-nbd-to-small-block-error.sh | 1 +
copy/copy-tls.sh | 1 +
fuse/test-file-mode.sh | 1 +
fuse/test-nbdkit.sh | 1 +
fuse/test-qcow2.sh | 1 +
info/info-map-qemu-dirty-bitmap.sh | 4 ++--
11 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/tests/functions.sh.in b/tests/functions.sh.in
index 2f5206fd4e14..345b2a290a19 100644
--- a/tests/functions.sh.in
+++ b/tests/functions.sh.in
@@ -76,6 +76,27 @@ requires ()
}
}
+# requires_qemu
+#
+# Check that qemu-kvm or qemu-system-$(uname -m) works. If not, skip the test.
+# If it does, then export the appropriate binary name in $QEMU_BINARY.
+requires_qemu ()
+{
+ local qemu_bin
+ for qemu_bin in "qemu-kvm" "qemu-system-$(uname -m)"; do
+ ( "$qemu_bin" --version ) </dev/null >/dev/null 2>&1 ||
continue
+
+ export QEMU_BINARY="$qemu_bin"
+ break
+ done
+
+ if test -z "$QEMU_BINARY"; then
+ echo "$0: ‘$*’ failed with error code $?"
+ echo "$0: test prerequisite is missing or not working"
+ exit 77
+ fi
+}
+
# Tests that run under check-root should use this.
requires_root ()
{
diff --git a/interop/dirty-bitmap.sh b/interop/dirty-bitmap.sh
index 6db44f2b41b4..5ba0e69a06af 100755
--- a/interop/dirty-bitmap.sh
+++ b/interop/dirty-bitmap.sh
@@ -25,7 +25,7 @@ set -x
requires qemu-img --version
requires qemu-io --version
requires qemu-nbd --version
-requires qemu-kvm --version
+requires_qemu
# This test uses the qemu-nbd -B option.
if ! qemu-nbd --help | grep -sq -- -B; then
@@ -46,7 +46,7 @@ cat <<'EOF' |
{'execute':'block-dirty-bitmap-add','arguments':{'node':'n','name':'bitmap0','persistent':true}}
{'execute':'quit'}
EOF
- qemu-kvm -nodefaults -nographic -qmp stdio -machine none,accel=tcg
+ $QEMU_BINARY -nodefaults -nographic -qmp stdio -machine none,accel=tcg
qemu-io -f qcow2 -c 'w 64k 64k' -c 'w -z 512k 64k' dirty-bitmap.qcow2
# Run the test.
diff --git a/copy/copy-block-to-nbd.sh b/copy/copy-block-to-nbd.sh
index 0d84cb304e8b..a81a4ba44823 100755
--- a/copy/copy-block-to-nbd.sh
+++ b/copy/copy-block-to-nbd.sh
@@ -23,6 +23,7 @@ set -x
requires_root
requires nbdkit --exit-with-parent --version
+requires test -e /sys/module/nbd
requires nbd-client --version
# /dev/nbd0 must not be in use.
requires_not nbd-client -c /dev/nbd0
diff --git a/copy/copy-nbd-to-block.sh b/copy/copy-nbd-to-block.sh
index 6fcb18d99ca1..38cc7ac2a34e 100755
--- a/copy/copy-nbd-to-block.sh
+++ b/copy/copy-nbd-to-block.sh
@@ -23,6 +23,7 @@ set -x
requires_root
requires nbdkit --exit-with-parent --version
+requires test -e /sys/module/nbd
requires nbd-client --version
# /dev/nbd0 must not be in use.
requires_not nbd-client -c /dev/nbd0
diff --git a/copy/copy-nbd-to-nbd.sh b/copy/copy-nbd-to-nbd.sh
index 44134ab795f6..a7526cdb549f 100755
--- a/copy/copy-nbd-to-nbd.sh
+++ b/copy/copy-nbd-to-nbd.sh
@@ -23,6 +23,7 @@ set -x
requires nbdkit --exit-with-parent --version
requires cmp --version
+requires hexdump --version
pidfile1=copy-nbd-to-nbd.pid1
pidfile2=copy-nbd-to-nbd.pid2
diff --git a/copy/copy-nbd-to-small-block-error.sh
b/copy/copy-nbd-to-small-block-error.sh
index 669f77a0a338..eb78b9456a3f 100755
--- a/copy/copy-nbd-to-small-block-error.sh
+++ b/copy/copy-nbd-to-small-block-error.sh
@@ -23,6 +23,7 @@ set -x
requires_root
requires nbdkit --exit-with-parent --version
+requires test -e /sys/module/nbd
requires nbd-client --version
# /dev/nbd0 must not be in use.
requires_not nbd-client -c /dev/nbd0
diff --git a/copy/copy-tls.sh b/copy/copy-tls.sh
index 6a15202d5fa8..b4b3c71db02f 100755
--- a/copy/copy-tls.sh
+++ b/copy/copy-tls.sh
@@ -29,6 +29,7 @@ requires test "x$PSKTOOL" != "x"
requires nbdkit --exit-with-parent --version
requires bash -c "nbdkit --dump-config | grep tls=yes"
requires cmp --version
+requires hexdump --version
pskfile=copy-tls.psk
pidfile1=copy-tls.pid1
diff --git a/fuse/test-file-mode.sh b/fuse/test-file-mode.sh
index ebd74ff7c397..c6d407f197b5 100755
--- a/fuse/test-file-mode.sh
+++ b/fuse/test-file-mode.sh
@@ -27,6 +27,7 @@ requires fusermount3 --version
requires nbdkit --exit-with-parent --version
requires cmp --version
requires dd --version
+requires test -e /dev/fuse
if ! test -r /dev/urandom; then
echo "$0: test skipped: /dev/urandom not readable"
diff --git a/fuse/test-nbdkit.sh b/fuse/test-nbdkit.sh
index a9c3eff51f8b..c66060aa2cf2 100755
--- a/fuse/test-nbdkit.sh
+++ b/fuse/test-nbdkit.sh
@@ -27,6 +27,7 @@ requires fusermount3 --version
requires nbdkit --exit-with-parent --version
requires cmp --version
requires dd --version
+requires test -e /dev/fuse
if ! test -r /dev/urandom; then
echo "$0: test skipped: /dev/urandom not readable"
diff --git a/fuse/test-qcow2.sh b/fuse/test-qcow2.sh
index 0c862b92897f..9361ec72bb13 100755
--- a/fuse/test-qcow2.sh
+++ b/fuse/test-qcow2.sh
@@ -29,6 +29,7 @@ requires qemu-nbd --version
requires qemu-img --version
requires cmp --version
requires dd --version
+requires test -e /dev/fuse
if ! test -r /dev/urandom; then
echo "$0: test skipped: /dev/urandom not readable"
diff --git a/info/info-map-qemu-dirty-bitmap.sh b/info/info-map-qemu-dirty-bitmap.sh
index 90bbe1820c7c..7df3ff5e4895 100755
--- a/info/info-map-qemu-dirty-bitmap.sh
+++ b/info/info-map-qemu-dirty-bitmap.sh
@@ -27,7 +27,7 @@ set -x
requires qemu-img --version
requires qemu-io --version
requires qemu-nbd --version
-requires qemu-kvm --version
+requires_qemu
requires tr --version
# This test uses the qemu-nbd -B option.
@@ -50,7 +50,7 @@ cat <<'EOF' |
{'execute':'block-dirty-bitmap-add','arguments':{'node':'n','name':'bitmap0','persistent':true}}
{'execute':'quit'}
EOF
- qemu-kvm -nodefaults -nographic -qmp stdio -machine none,accel=tcg
+ $QEMU_BINARY -nodefaults -nographic -qmp stdio -machine none,accel=tcg
qemu-io -f qcow2 -c 'w 64k 64k' -c 'w -z 512k 64k' $f
# We have to run qemu-nbd and attempt to clean it up afterwards.
--
2.31.1
7:10 a.m.
New subject: [libnbd PATCH 1/5] Fix test requirements
On 5/6/21 6:30 AM, Martin Kletzander wrote:
Some tests have extra dependencies that may be missing in minimal
deployments (e.g. hexdump), some require kernel modules or support (nbd, fuse)
and others need qemu, but were written to only work with qemu-kvm binary.
All these were fixed to my best knowledge, but of course they are still not
perfect.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
+# requires_qemu
+#
+# Check that qemu-kvm or qemu-system-$(uname -m) works. If not, skip the test.
+# If it does, then export the appropriate binary name in $QEMU_BINARY.
+requires_qemu ()
+{
+ local qemu_bin
+ for qemu_bin in "qemu-kvm" "qemu-system-$(uname -m)"; do
+ ( "$qemu_bin" --version ) </dev/null >/dev/null 2>&1 ||
continue
+
+ export QEMU_BINARY="$qemu_bin"
+ break
+ done
+
+ if test -z "$QEMU_BINARY"; then
+ echo "$0: ‘$*’ failed with error code $?"
$* is empty in the typical case of calling 'requires_qemu' without
arguments, so you may want to reword this message.
+ echo "$0: test prerequisite is missing or not
working"
+ exit 77
+ fi
+}
+
# Tests that run under check-root should use this.
requires_root ()
{
+++ b/copy/copy-block-to-nbd.sh
@@ -23,6 +23,7 @@ set -x
requires_root
requires nbdkit --exit-with-parent --version
+requires test -e /sys/module/nbd
Is it enough that the file exists, or do we also want to test that it
can be read? Then again, since we used requires_root, we should have
privileges to use the file if it exists.
+++ b/fuse/test-file-mode.sh
@@ -27,6 +27,7 @@ requires fusermount3 --version
requires nbdkit --exit-with-parent --version
requires cmp --version
requires dd --version
+requires test -e /dev/fuse
Another spot where -r might make more sense than -e?
Overall, makes sense to me.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
8:20 a.m.
New subject: [libnbd PATCH 1/5] Fix test requirements
On Fri, May 07, 2021 at 07:10:49AM -0500, Eric Blake wrote:
On 5/6/21 6:30 AM, Martin Kletzander wrote:
> Some tests have extra dependencies that may be missing in minimal
> deployments (e.g. hexdump), some require kernel modules or support (nbd, fuse)
> and others need qemu, but were written to only work with qemu-kvm binary.
>
> All these were fixed to my best knowledge, but of course they are still not
> perfect.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> +# requires_qemu
> +#
> +# Check that qemu-kvm or qemu-system-$(uname -m) works. If not, skip the test.
> +# If it does, then export the appropriate binary name in $QEMU_BINARY.
> +requires_qemu ()
> +{
> + local qemu_bin
> + for qemu_bin in "qemu-kvm" "qemu-system-$(uname -m)"; do
> + ( "$qemu_bin" --version ) </dev/null >/dev/null 2>&1
|| continue
> +
> + export QEMU_BINARY="$qemu_bin"
> + break
> + done
> +
> + if test -z "$QEMU_BINARY"; then
> + echo "$0: ‘$*’ failed with error code $?"
$* is empty in the typical case of calling 'requires_qemu' without
arguments, so you may want to reword this message.
Oh yes, I had to write this roughly 7 times because I always wrote it
into functions.sh by mistake and then ran the build rewriting it. I'll
just change it to "No usable qemu binary found", maybe attach the list
of the ones that were tried.
> + echo "$0: test prerequisite is missing or not
working"
> + exit 77
> + fi
> +}
> +
> # Tests that run under check-root should use this.
> requires_root ()
> {
> +++ b/copy/copy-block-to-nbd.sh
> @@ -23,6 +23,7 @@ set -x
>
> requires_root
> requires nbdkit --exit-with-parent --version
> +requires test -e /sys/module/nbd
Is it enough that the file exists, or do we also want to test that it
can be read? Then again, since we used requires_root, we should have
privileges to use the file if it exists.
I am not sure. I am just checking that the module exists in the kernel,
but I do not know how to reliably check that it is usable. As I wrote
in the cover letter, maybe I need to check for some capability or
permission, but I did not figure out exactly which one. In the end this
was better than nothing as it strictly eliminates tests that would
failed just because there is no nbd support in the kernel (unloaded
module).
> +++ b/fuse/test-file-mode.sh
> @@ -27,6 +27,7 @@ requires fusermount3 --version
> requires nbdkit --exit-with-parent --version
> requires cmp --version
> requires dd --version
> +requires test -e /dev/fuse
Another spot where -r might make more sense than -e?
Again, with this one I am not sure this particular file is used to do
fuse. I tried checking /sys/modules/fuse, but that did not help as it
existed in the container, but anything with fuse just failed. This was
the only one I could come up with and I would be very glad for any
better ideas.
Overall, makes sense to me.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
6:18 a.m.
New subject: [libnbd PATCH 1/5] Fix test requirements
On Thu, May 06, 2021 at 01:30:06PM +0200, Martin Kletzander wrote:
Some tests have extra dependencies that may be missing in minimal
deployments (e.g. hexdump), some require kernel modules or support (nbd, fuse)
and others need qemu, but were written to only work with qemu-kvm binary.
All these were fixed to my best knowledge, but of course they are still not
perfect.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/functions.sh.in | 21 +++++++++++++++++++++
interop/dirty-bitmap.sh | 4 ++--
copy/copy-block-to-nbd.sh | 1 +
copy/copy-nbd-to-block.sh | 1 +
copy/copy-nbd-to-nbd.sh | 1 +
copy/copy-nbd-to-small-block-error.sh | 1 +
copy/copy-tls.sh | 1 +
fuse/test-file-mode.sh | 1 +
fuse/test-nbdkit.sh | 1 +
fuse/test-qcow2.sh | 1 +
info/info-map-qemu-dirty-bitmap.sh | 4 ++--
11 files changed, 33 insertions(+), 4 deletions(-)
Eric picked up a few minor mistakes in his review, but with those
fixed this one looks good.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html
6:30 a.m.
New subject: [libnbd PATCH 2/5] Change golang/run_tests.sh shebang to bash
The sourced tests/functions.sh uses bashisms like arrays and bash for loops.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
golang/run-tests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/golang/run-tests.sh b/golang/run-tests.sh
index 9009685b49dd..6857047c7a4a 100755
--- a/golang/run-tests.sh
+++ b/golang/run-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/bash -
# nbd client library in userspace
# Copyright (C) 2013-2020 Red Hat Inc.
#
--
2.31.1
7:11 a.m.
New subject: [libnbd PATCH 2/5] Change golang/run_tests.sh shebang to bash
On 5/6/21 6:30 AM, Martin Kletzander wrote:
The sourced tests/functions.sh uses bashisms like arrays and bash for
loops.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
golang/run-tests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
ACK
diff --git a/golang/run-tests.sh b/golang/run-tests.sh
index 9009685b49dd..6857047c7a4a 100755
--- a/golang/run-tests.sh
+++ b/golang/run-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/bash -
# nbd client library in userspace
# Copyright (C) 2013-2020 Red Hat Inc.
#
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
6:20 a.m.
New subject: [libnbd PATCH 2/5] Change golang/run_tests.sh shebang to bash
On Thu, May 06, 2021 at 01:30:07PM +0200, Martin Kletzander wrote:
The sourced tests/functions.sh uses bashisms like arrays and bash for
loops.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
golang/run-tests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/golang/run-tests.sh b/golang/run-tests.sh
index 9009685b49dd..6857047c7a4a 100755
--- a/golang/run-tests.sh
+++ b/golang/run-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/bash -
# nbd client library in userspace
# Copyright (C) 2013-2020 Red Hat Inc.
#
Yes, this kind of change is generally good, since we require bash
(even on *BSD). If you find any more like this, just change them.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html
6:30 a.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
At some point GCC added some optimisations and checks that started emitting
warnings on harmless code:
...dereferencing type-punned pointer will break strict-aliasing rules...
This was later fixed, but can still break the build (or report warnings) on old
GCCs (e.g. 7.5.0) when building the libev example.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
configure.ac | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/configure.ac b/configure.ac
index 19b7bfdb5d2a..3b51354346cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,30 @@ PKG_CHECK_MODULES([LIBEV], [libev], [
AC_MSG_WARN([ev.h not found, some examples will not be compiled])
])
])
+
+AS_IF([test "x$LIBEV_LIBS" != "x"], [
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="-Werror=strict-aliasing -O2"
+ AC_MSG_CHECKING([if the compiler is new enough for good aliasing rules])
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([
+ #include <ev.h>
+
+ static void cb (struct ev_loop *l, ev_timer *t, int e) { }
+ static ev_timer timer;
+ ], [
+ ev_timer_init (&timer, cb, 0, .1);
+ ])
+ ], [
+ AC_MSG_RESULT([yes])
+ ], [
+ AC_MSG_RESULT([no])
+ AC_SUBST([LIBEV_CFLAGS], [""])
+ AC_SUBST([LIBEV_LIBS], [""])
+ AC_MSG_WARN([compiler is probably too old to compile with libev without errors,
some examples will not be compiled])
+ ])
+ CFLAGS="$old_CFLAGS"
+])
AM_CONDITIONAL([HAVE_LIBEV], [test "x$LIBEV_LIBS" != "x"])
dnl FUSE 3 is optional to build the nbdfuse program.
--
2.31.1
7:14 a.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
On 5/6/21 6:30 AM, Martin Kletzander wrote:
At some point GCC added some optimisations and checks that started
emitting
warnings on harmless code:
...dereferencing type-punned pointer will break strict-aliasing rules...
This was later fixed, but can still break the build (or report warnings) on old
GCCs (e.g. 7.5.0) when building the libev example.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
configure.ac | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/configure.ac b/configure.ac
index 19b7bfdb5d2a..3b51354346cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,30 @@ PKG_CHECK_MODULES([LIBEV], [libev], [
AC_MSG_WARN([ev.h not found, some examples will not be compiled])
])
])
+
+AS_IF([test "x$LIBEV_LIBS" != "x"], [
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="-Werror=strict-aliasing -O2"
+ AC_MSG_CHECKING([if the compiler is new enough for good aliasing rules])
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([
+ #include <ev.h>
+
+ static void cb (struct ev_loop *l, ev_timer *t, int e) { }
+ static ev_timer timer;
+ ], [
+ ev_timer_init (&timer, cb, 0, .1);
+ ])
+ ], [
+ AC_MSG_RESULT([yes])
+ ], [
+ AC_MSG_RESULT([no])
+ AC_SUBST([LIBEV_CFLAGS], [""])
+ AC_SUBST([LIBEV_LIBS], [""])
+ AC_MSG_WARN([compiler is probably too old to compile with libev without errors,
some examples will not be compiled])
Do we really need to skip compiling the example altogether, or can we
just modify CFLAGS to add -Wno-strict-aliasing to prevent the failure?
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
8:23 a.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
On Fri, May 07, 2021 at 07:14:32AM -0500, Eric Blake wrote:
On 5/6/21 6:30 AM, Martin Kletzander wrote:
> At some point GCC added some optimisations and checks that started emitting
> warnings on harmless code:
>
> ...dereferencing type-punned pointer will break strict-aliasing rules...
>
> This was later fixed, but can still break the build (or report warnings) on old
> GCCs (e.g. 7.5.0) when building the libev example.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> configure.ac | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> index 19b7bfdb5d2a..3b51354346cc 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -247,6 +247,30 @@ PKG_CHECK_MODULES([LIBEV], [libev], [
> AC_MSG_WARN([ev.h not found, some examples will not be compiled])
> ])
> ])
> +
> +AS_IF([test "x$LIBEV_LIBS" != "x"], [
> + old_CFLAGS="$CFLAGS"
> + CFLAGS="-Werror=strict-aliasing -O2"
> + AC_MSG_CHECKING([if the compiler is new enough for good aliasing rules])
> + AC_COMPILE_IFELSE([
> + AC_LANG_PROGRAM([
> + #include <ev.h>
> +
> + static void cb (struct ev_loop *l, ev_timer *t, int e) { }
> + static ev_timer timer;
> + ], [
> + ev_timer_init (&timer, cb, 0, .1);
> + ])
> + ], [
> + AC_MSG_RESULT([yes])
> + ], [
> + AC_MSG_RESULT([no])
> + AC_SUBST([LIBEV_CFLAGS], [""])
> + AC_SUBST([LIBEV_LIBS], [""])
> + AC_MSG_WARN([compiler is probably too old to compile with libev without
errors, some examples will not be compiled])
Do we really need to skip compiling the example altogether, or can we
just modify CFLAGS to add -Wno-strict-aliasing to prevent the failure?
This is one of the results that I was not sure about. We could just add
no-strict-aliasing for that one particular example of course. I figured
it is just an example and it only causes an issue on CentOS 7, OpenSUSE
Leap 15.2, Ubuntu 18.04 and some similarly old systems if I remember
correctly. But changing the LIBEV_CFLAGS seems more fit for the purpose.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
8:41 a.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
On 5/7/21 8:23 AM, Martin Kletzander wrote:
>> + AC_MSG_CHECKING([if the compiler is new enough for good
aliasing
>> rules])
>> + AC_COMPILE_IFELSE([
>> + AC_LANG_PROGRAM([
>> + #include <ev.h>
>> +
>> + static void cb (struct ev_loop *l, ev_timer *t, int e) { }
>> + static ev_timer timer;
>> + ], [
>> + ev_timer_init (&timer, cb, 0, .1);
>> + ])
>> + ], [
>> + AC_MSG_RESULT([yes])
>> + ], [
>> + AC_MSG_RESULT([no])
>> + AC_SUBST([LIBEV_CFLAGS], [""])
>> + AC_SUBST([LIBEV_LIBS], [""])
>> + AC_MSG_WARN([compiler is probably too old to compile with
>> libev without errors, some examples will not be compiled])
>
> Do we really need to skip compiling the example altogether, or can we
> just modify CFLAGS to add -Wno-strict-aliasing to prevent the failure?
>
This is one of the results that I was not sure about. We could just add
no-strict-aliasing for that one particular example of course. I figured
it is just an example and it only causes an issue on CentOS 7, OpenSUSE
Leap 15.2, Ubuntu 18.04 and some similarly old systems if I remember
correctly. But changing the LIBEV_CFLAGS seems more fit for the purpose.
Sounds even better!
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
4:03 p.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
On Fri, May 7, 2021 at 4:24 PM Martin Kletzander <mkletzan(a)redhat.com> wrote:
On Fri, May 07, 2021 at 07:14:32AM -0500, Eric Blake wrote:
>On 5/6/21 6:30 AM, Martin Kletzander wrote:
>> At some point GCC added some optimisations and checks that started emitting
>> warnings on harmless code:
>>
>> ...dereferencing type-punned pointer will break strict-aliasing rules...
>>
>> This was later fixed, but can still break the build (or report warnings) on old
>> GCCs (e.g. 7.5.0) when building the libev example.
>>
>> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
>> ---
>> configure.ac | 24 ++++++++++++++++++++++++
>> 1 file changed, 24 insertions(+)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 19b7bfdb5d2a..3b51354346cc 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -247,6 +247,30 @@ PKG_CHECK_MODULES([LIBEV], [libev], [
>> AC_MSG_WARN([ev.h not found, some examples will not be compiled])
>> ])
>> ])
>> +
>> +AS_IF([test "x$LIBEV_LIBS" != "x"], [
>> + old_CFLAGS="$CFLAGS"
>> + CFLAGS="-Werror=strict-aliasing -O2"
>> + AC_MSG_CHECKING([if the compiler is new enough for good aliasing rules])
>> + AC_COMPILE_IFELSE([
>> + AC_LANG_PROGRAM([
>> + #include <ev.h>
>> +
>> + static void cb (struct ev_loop *l, ev_timer *t, int e) { }
>> + static ev_timer timer;
>> + ], [
>> + ev_timer_init (&timer, cb, 0, .1);
>> + ])
>> + ], [
>> + AC_MSG_RESULT([yes])
>> + ], [
>> + AC_MSG_RESULT([no])
>> + AC_SUBST([LIBEV_CFLAGS], [""])
>> + AC_SUBST([LIBEV_LIBS], [""])
>> + AC_MSG_WARN([compiler is probably too old to compile with libev without
errors, some examples will not be compiled])
>
>Do we really need to skip compiling the example altogether, or can we
>just modify CFLAGS to add -Wno-strict-aliasing to prevent the failure?
>
This is one of the results that I was not sure about. We could just add
no-strict-aliasing for that one particular example of course. I figured
it is just an example and it only causes an issue on CentOS 7, OpenSUSE
Leap 15.2, Ubuntu 18.04 and some similarly old systems if I remember
correctly.
Do we really support Centos 7? libnbd is available since rhel 8 (2, 3?).
Why support older systems?
Time spent on older systems means less time working features,
performance, support for new systems, etc.
But changing the LIBEV_CFLAGS seems more fit for the purpose.
Sounds like the best option.
Nir
8:58 a.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
On Mon, May 10, 2021 at 12:03:36AM +0300, Nir Soffer wrote:
On Fri, May 7, 2021 at 4:24 PM Martin Kletzander
<mkletzan(a)redhat.com> wrote:
>
> On Fri, May 07, 2021 at 07:14:32AM -0500, Eric Blake wrote:
> >On 5/6/21 6:30 AM, Martin Kletzander wrote:
> >> At some point GCC added some optimisations and checks that started emitting
> >> warnings on harmless code:
> >>
> >> ...dereferencing type-punned pointer will break strict-aliasing rules...
> >>
> >> This was later fixed, but can still break the build (or report warnings) on
old
> >> GCCs (e.g. 7.5.0) when building the libev example.
> >>
> >> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> >> ---
> >> configure.ac | 24 ++++++++++++++++++++++++
> >> 1 file changed, 24 insertions(+)
> >>
> >> diff --git a/configure.ac b/configure.ac
> >> index 19b7bfdb5d2a..3b51354346cc 100644
> >> --- a/configure.ac
> >> +++ b/configure.ac
> >> @@ -247,6 +247,30 @@ PKG_CHECK_MODULES([LIBEV], [libev], [
> >> AC_MSG_WARN([ev.h not found, some examples will not be compiled])
> >> ])
> >> ])
> >> +
> >> +AS_IF([test "x$LIBEV_LIBS" != "x"], [
> >> + old_CFLAGS="$CFLAGS"
> >> + CFLAGS="-Werror=strict-aliasing -O2"
> >> + AC_MSG_CHECKING([if the compiler is new enough for good aliasing
rules])
> >> + AC_COMPILE_IFELSE([
> >> + AC_LANG_PROGRAM([
> >> + #include <ev.h>
> >> +
> >> + static void cb (struct ev_loop *l, ev_timer *t, int e) { }
> >> + static ev_timer timer;
> >> + ], [
> >> + ev_timer_init (&timer, cb, 0, .1);
> >> + ])
> >> + ], [
> >> + AC_MSG_RESULT([yes])
> >> + ], [
> >> + AC_MSG_RESULT([no])
> >> + AC_SUBST([LIBEV_CFLAGS], [""])
> >> + AC_SUBST([LIBEV_LIBS], [""])
> >> + AC_MSG_WARN([compiler is probably too old to compile with libev
without errors, some examples will not be compiled])
> >
> >Do we really need to skip compiling the example altogether, or can we
> >just modify CFLAGS to add -Wno-strict-aliasing to prevent the failure?
> >
>
> This is one of the results that I was not sure about. We could just add
> no-strict-aliasing for that one particular example of course. I figured
> it is just an example and it only causes an issue on CentOS 7, OpenSUSE
> Leap 15.2, Ubuntu 18.04 and some similarly old systems if I remember
> correctly.
Do we really support Centos 7? libnbd is available since rhel 8 (2, 3?).
Why support older systems?
Strictly speaking I do not think there is any description of what is
supported for libnbd. I just wanted as much as possible to start with,
but centos7 is now already out.
Time spent on older systems means less time working features,
performance, support for new systems, etc.
> But changing the LIBEV_CFLAGS seems more fit for the purpose.
Sounds like the best option.
I did that, we can remove it later.
Nir
11:10 a.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
On Wed, May 12, 2021 at 03:58:37PM +0200, Martin Kletzander wrote:
On Mon, May 10, 2021 at 12:03:36AM +0300, Nir Soffer wrote:
>Do we really support Centos 7? libnbd is available since rhel 8 (2, 3?).
>Why support older systems?
>
Strictly speaking I do not think there is any description of what is
supported for libnbd. I just wanted as much as possible to start with,
but centos7 is now already out.
Upstream I'm trying to keep the various parts of the project compiling
on RHEL 7. That means things like adding 'requires' to libnbd &
nbdkit tests to compensate for old versions of qemu, and in virt-v2v
not using newer features of OCaml than are present in RHEL 7 (ocaml-4.05).
From a downstream / RHEL perspective we're not intending to do
anything other than security fixes for RHEL 7.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/
6:21 a.m.
New subject: [libnbd PATCH 3/5] libev: Check for old compiler
Patch already discussed extensively. I'm happy with what seems to
have been decided (adding -Wno-strict-aliasing I think).
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v
6:30 a.m.
New subject: [libnbd PATCH 4/5] golang: Check for module support
If golang does not support modules, then it is too old anyway.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3b51354346cc..31130218a1e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,7 +494,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
AC_CHECK_PROG([GOLANG],[go],[go],[no])
AS_IF([test "x$GOLANG" != "xno"],[
AC_MSG_CHECKING([if $GOLANG is usable])
- AS_IF([$GOLANG run $srcdir/golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
+ AS_IF([$GOLANG run $srcdir/golang/config-test.go && $GOLANG help modules
>/dev/null 2>&AS_MESSAGE_LOG_FD],[
AC_MSG_RESULT([yes])
# Print the version to help with debugging.
--
2.31.1
7:17 a.m.
New subject: [libnbd PATCH 4/5] golang: Check for module support
On 5/6/21 6:30 AM, Martin Kletzander wrote:
If golang does not support modules, then it is too old anyway.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3b51354346cc..31130218a1e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,7 +494,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
AC_CHECK_PROG([GOLANG],[go],[go],[no])
AS_IF([test "x$GOLANG" != "xno"],[
AC_MSG_CHECKING([if $GOLANG is usable])
- AS_IF([$GOLANG run $srcdir/golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
+ AS_IF([$GOLANG run $srcdir/golang/config-test.go && $GOLANG help modules
>/dev/null 2>&AS_MESSAGE_LOG_FD],[
Long line; I'd break after the &&.
Also, why are you not sending the output of config-test.go to
AS_MESSAGE_LOG_FD any more? And why send stdout to /dev/null? Either
you have to repeat the redirections, or you should group the two commands:
AS_IF([{$GOLANG run ... && $GOLANG help; } 2>&AS_MESSAGE_LOG_FD
AC_MSG_RESULT([yes])
# Print the version to help with debugging.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
8:25 a.m.
New subject: [libnbd PATCH 4/5] golang: Check for module support
On Fri, May 07, 2021 at 07:17:00AM -0500, Eric Blake wrote:
On 5/6/21 6:30 AM, Martin Kletzander wrote:
> If golang does not support modules, then it is too old anyway.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> configure.ac | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 3b51354346cc..31130218a1e6 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -494,7 +494,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
> AC_CHECK_PROG([GOLANG],[go],[go],[no])
> AS_IF([test "x$GOLANG" != "xno"],[
> AC_MSG_CHECKING([if $GOLANG is usable])
> - AS_IF([$GOLANG run $srcdir/golang/config-test.go
2>&AS_MESSAGE_LOG_FD],[
> + AS_IF([$GOLANG run $srcdir/golang/config-test.go && $GOLANG help
modules >/dev/null 2>&AS_MESSAGE_LOG_FD],[
Long line; I'd break after the &&.
Also, why are you not sending the output of config-test.go to
AS_MESSAGE_LOG_FD any more? And why send stdout to /dev/null? Either
you have to repeat the redirections, or you should group the two commands:
AS_IF([{$GOLANG run ... && $GOLANG help; } 2>&AS_MESSAGE_LOG_FD
Yep, I had this there before resetting the branch by mistake. Thanks
for reminding me.
The standard output of `go help modules` was longer on some system I
believe, but it does not really matter and we can simply keep
everything.
> AC_MSG_RESULT([yes])
>
> # Print the version to help with debugging.
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
4:14 p.m.
New subject: [libnbd PATCH 4/5] golang: Check for module support
On Fri, May 07, 2021 at 07:17:00AM -0500, Eric Blake wrote:
On 5/6/21 6:30 AM, Martin Kletzander wrote:
> If golang does not support modules, then it is too old anyway.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> configure.ac | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 3b51354346cc..31130218a1e6 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -494,7 +494,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
> AC_CHECK_PROG([GOLANG],[go],[go],[no])
> AS_IF([test "x$GOLANG" != "xno"],[
> AC_MSG_CHECKING([if $GOLANG is usable])
> - AS_IF([$GOLANG run $srcdir/golang/config-test.go
2>&AS_MESSAGE_LOG_FD],[
> + AS_IF([$GOLANG run $srcdir/golang/config-test.go && $GOLANG help
modules >/dev/null 2>&AS_MESSAGE_LOG_FD],[
Long line; I'd break after the &&.
Also, why are you not sending the output of config-test.go to
AS_MESSAGE_LOG_FD any more? And why send stdout to /dev/null? Either
you have to repeat the redirections, or you should group the two commands:
AS_IF([{$GOLANG run ... && $GOLANG help; } 2>&AS_MESSAGE_LOG_FD
I did not manage to make autoconf like anything else than the repeated
command redirections, so I switched to that. I also added 1>&2 to send
the stdout to the log as well so that it does not needlessly pollute the
configure output.
> AC_MSG_RESULT([yes])
>
> # Print the version to help with debugging.
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
6:22 a.m.
New subject: [libnbd PATCH 4/5] golang: Check for module support
On Thu, May 06, 2021 at 01:30:09PM +0200, Martin Kletzander wrote:
If golang does not support modules, then it is too old anyway.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3b51354346cc..31130218a1e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,7 +494,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
AC_CHECK_PROG([GOLANG],[go],[go],[no])
AS_IF([test "x$GOLANG" != "xno"],[
AC_MSG_CHECKING([if $GOLANG is usable])
- AS_IF([$GOLANG run $srcdir/golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
+ AS_IF([$GOLANG run $srcdir/golang/config-test.go && $GOLANG help modules
>/dev/null 2>&AS_MESSAGE_LOG_FD],[
AC_MSG_RESULT([yes])
# Print the version to help with debugging.
With Eric's suggested changes, this is fine.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top
6:30 a.m.
New subject: [libnbd PATCH 5/5] Introduction of automated testing
This setup uses the libvirt-ci to get as much coverage as possible with the ease
of use provided by that repository. Not all the data are available there at the
time of posting this patch, so if anyone wants to recreate the Containerfiles
and variable files (for cirrus CI) my temporary branch of libvirt-ci called
nbd_prep has all the work that is going to be proposed for inclusion there once
this goes in:
https://gitlab.com/nertpinx/libvirt-ci/-/tree/nbd_prep
The result of this branch CI run is available here:
https://gitlab.com/nertpinx/libnbd/-/pipelines
If there are any questions related to how the CI is running, how it
works, how to replicate CI builds locally or how to change anything,
then I am more than happy to help.
Actually recreating the builds locally (at least for Linux distributions
and setups) is pretty straightforward. Choose a file from ci/containers
which represents the desired setup, for our example let's pick fedora
rawhide, and build your container and tag it, e.g. using podman (or feel
free to substitute "podman" with "docker"):
podman build ci/containers/fedora-33.Dockerfile -t libnbd-fedora-rawhide
That will get you a container tagged `libnbd-fedora-rawhide` that you
can execute the tests on. You can then run whatever you want inside
that container with the current repository passed through like this:
podman run -it --rm -v .:/repo -w /repo libnbd-fedora-rawhide bash
which will bind-mount the current directory onto /repo inside the
container and also use that path as the working directory (just so you
do not have to `cd /repo` before any commands. I prefer running bash,
but of course you can just run the build script used in the CI. I have
put all the CI build commands into one file for simplicity, so that you
can simply run `ci/build_script.sh`. Executing that script will give
you the results and you can experiment right inside that environment to
figure out what is needed. At the same time you can easily modify any
files inside that repository on your host, just like you are used to, so
that you can use your editor and other setups that work for you. Just
make sure that build files do not interfere between the host and the
container, if you want to replicate a clean build you need to either use
VPATH or just clean everything.
Let me know what you think, and have a nice day.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
Makefile.am | 1 +
.gitlab-ci.yml | 479 ++++++++++++++++++
ci/build_script.sh | 43 ++
ci/cirrus/build.yml | 22 +
ci/cirrus/freebsd-12.vars | 14 +
ci/cirrus/freebsd-current.vars | 14 +
ci/cirrus/macos-11.vars | 14 +
ci/cirrus/refresh | 22 +
ci/containers/README.rst | 14 +
ci/containers/centos-8.Dockerfile | 61 +++
ci/containers/centos-stream-8.Dockerfile | 61 +++
.../debian-10-cross-aarch64.Dockerfile | 86 ++++
.../debian-10-cross-armv6l.Dockerfile | 86 ++++
.../debian-10-cross-armv7l.Dockerfile | 86 ++++
ci/containers/debian-10-cross-i686.Dockerfile | 86 ++++
ci/containers/debian-10-cross-mips.Dockerfile | 86 ++++
.../debian-10-cross-mips64el.Dockerfile | 86 ++++
.../debian-10-cross-mipsel.Dockerfile | 86 ++++
.../debian-10-cross-ppc64le.Dockerfile | 86 ++++
.../debian-10-cross-s390x.Dockerfile | 86 ++++
ci/containers/debian-10.Dockerfile | 64 +++
.../debian-sid-cross-aarch64.Dockerfile | 86 ++++
.../debian-sid-cross-armv6l.Dockerfile | 86 ++++
.../debian-sid-cross-armv7l.Dockerfile | 86 ++++
.../debian-sid-cross-i686.Dockerfile | 86 ++++
.../debian-sid-cross-mips64el.Dockerfile | 86 ++++
.../debian-sid-cross-mipsel.Dockerfile | 86 ++++
.../debian-sid-cross-ppc64le.Dockerfile | 86 ++++
.../debian-sid-cross-s390x.Dockerfile | 86 ++++
ci/containers/debian-sid.Dockerfile | 64 +++
ci/containers/fedora-33.Dockerfile | 68 +++
ci/containers/fedora-34.Dockerfile | 68 +++
.../fedora-rawhide-cross-mingw32.Dockerfile | 71 +++
.../fedora-rawhide-cross-mingw64.Dockerfile | 71 +++
ci/containers/fedora-rawhide.Dockerfile | 69 +++
ci/containers/opensuse-leap-152.Dockerfile | 56 ++
ci/containers/opensuse-tumbleweed.Dockerfile | 57 +++
ci/containers/refresh | 42 ++
ci/containers/ubuntu-1804.Dockerfile | 62 +++
ci/containers/ubuntu-2004.Dockerfile | 64 +++
40 files changed, 2963 insertions(+)
create mode 100644 .gitlab-ci.yml
create mode 100755 ci/build_script.sh
create mode 100644 ci/cirrus/build.yml
create mode 100644 ci/cirrus/freebsd-12.vars
create mode 100644 ci/cirrus/freebsd-current.vars
create mode 100644 ci/cirrus/macos-11.vars
create mode 100755 ci/cirrus/refresh
create mode 100644 ci/containers/README.rst
create mode 100644 ci/containers/centos-8.Dockerfile
create mode 100644 ci/containers/centos-stream-8.Dockerfile
create mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
create mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
create mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
create mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
create mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
create mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
create mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
create mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
create mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
create mode 100644 ci/containers/debian-10.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-aarch64.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-armv6l.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-armv7l.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-i686.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-mips64el.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-mipsel.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-ppc64le.Dockerfile
create mode 100644 ci/containers/debian-sid-cross-s390x.Dockerfile
create mode 100644 ci/containers/debian-sid.Dockerfile
create mode 100644 ci/containers/fedora-33.Dockerfile
create mode 100644 ci/containers/fedora-34.Dockerfile
create mode 100644 ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
create mode 100644 ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
create mode 100644 ci/containers/fedora-rawhide.Dockerfile
create mode 100644 ci/containers/opensuse-leap-152.Dockerfile
create mode 100644 ci/containers/opensuse-tumbleweed.Dockerfile
create mode 100755 ci/containers/refresh
create mode 100644 ci/containers/ubuntu-1804.Dockerfile
create mode 100644 ci/containers/ubuntu-2004.Dockerfile
diff --git a/Makefile.am b/Makefile.am
index 8e5d42518e64..c98e3f0737e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,7 @@ maintainer-check-extra-dist:
@zcat $(PACKAGE_NAME)-$(VERSION).tar.gz | tar tf - | sort | \
sed 's,^$(PACKAGE_NAME)-$(VERSION)/,,' > tarfiles
@git ls-files | \
+ grep -v -e '^\.gitlab-ci.yml' -e '^ci/' | \
sort > gitfiles
@comm -13 tarfiles gitfiles > comm-out
@echo Checking for differences between EXTRA_DIST and git ...
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000000..07d81ca779df
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,479 @@
+variables:
+ GIT_DEPTH: 100
+
+stages:
+ - containers
+ - builds
+
+.script_variables: &script_variables |
+ export MAKEFLAGS="-j $(getconf _NPROCESSORS_ONLN)"
+ export CCACHE_BASEDIR="$(pwd)"
+ export CCACHE_DIR="$CCACHE_BASEDIR/ccache"
+ export CCACHE_MAXSIZE="500M"
+ export PATH="$CCACHE_WRAPPERSDIR:$PATH"
+
+# Common templates
+
+.container_job:
+ image: docker:stable
+ stage: containers
+ needs: []
+ services:
+ - docker:dind
+ before_script:
+ - export TAG="$CI_REGISTRY_IMAGE/$NAME:latest"
+ - export COMMON_TAG="$CI_REGISTRY/nbdkit/libnbd/$NAME:latest"
+ - docker info
+ - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p
"$CI_REGISTRY_PASSWORD"
+ script:
+ - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
+ - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG"
--tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers
+ - docker push "$TAG"
+ after_script:
+ - docker logout
+
+.native_build_job:
+ stage: builds
+ image: $CI_REGISTRY_IMAGE/$NAME:latest
+ cache:
+ paths:
+ - ccache/
+ key: "$CI_JOB_NAME"
+ before_script:
+ - *script_variables
+ script:
+ - ci/build_script.sh
+
+# Jobs that we delegate to Cirrus CI because they require an operating
+# system other than Linux. These jobs will only run if the required
+# setup has been performed on the GitLab account (see ci/README.rst).
+#
+# The Cirrus CI configuration is generated by replacing target-specific
+# variables in a generic template: some of these variables are provided
+# when the GitLab CI job is defined, others are taken from a shell
+# snippet generated using lcitool.
+#
+# Note that the $PATH environment variable has to be treated with
+# special care, because we can't just override it at the GitLab CI job
+# definition level or we risk breaking it completely.
+.cirrus_build_job:
+ stage: builds
+ image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
+ needs: []
+ script:
+ - source ci/cirrus/$NAME.vars
+ - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g"
+ -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g"
+ -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g"
+ -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g"
+ -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g"
+ -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g"
+ -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g"
+ -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g"
+ -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g"
+ -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g"
+ -e "s|[@]PKGS@|$PKGS|g"
+ -e "s|[@]MAKE@|$MAKE|g"
+ -e "s|[@]PYTHON@|$PYTHON|g"
+ -e "s|[@]PIP3@|$PIP3|g"
+ -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"
+ <ci/cirrus/build.yml >ci/cirrus/$NAME.yml
+ - cat ci/cirrus/$NAME.yml
+ - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml
+ rules:
+ - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN"
+
+.cross_build_job:
+ stage: builds
+ image: $CI_REGISTRY_IMAGE/$NAME-cross-$CROSS:latest
+ cache:
+ paths:
+ - ccache/
+ key: "$CI_JOB_NAME"
+ before_script:
+ - *script_variables
+ script:
+ - ci/build_script.sh
+
+# Native container build jobs
+
+x64-centos-8-container:
+ extends: .container_job
+ variables:
+ NAME: centos-8
+
+x64-centos-stream-8-container:
+ extends: .container_job
+ variables:
+ NAME: centos-stream-8
+
+x64-debian-10-container:
+ extends: .container_job
+ variables:
+ NAME: debian-10
+
+x64-debian-sid-container:
+ extends: .container_job
+ variables:
+ NAME: debian-sid
+
+x64-fedora-33-container:
+ extends: .container_job
+ variables:
+ NAME: fedora-33
+
+x64-fedora-34-container:
+ extends: .container_job
+ variables:
+ NAME: fedora-34
+
+x64-fedora-rawhide-container:
+ extends: .container_job
+ variables:
+ NAME: fedora-rawhide
+
+x64-opensuse-leap-152-container:
+ extends: .container_job
+ variables:
+ NAME: opensuse-leap-152
+
+x64-opensuse-tumbleweed-container:
+ extends: .container_job
+ variables:
+ NAME: opensuse-tumbleweed
+
+x64-ubuntu-1804-container:
+ extends: .container_job
+ variables:
+ NAME: ubuntu-1804
+
+x64-ubuntu-2004-container:
+ extends: .container_job
+ variables:
+ NAME: ubuntu-2004
+
+
+# Cross-build containers build jobs
+
+aarch64-debian-10-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-10-cross-aarch64
+
+armv6l-debian-10-container:
+ extends: .container_job
+ variables:
+ NAME: debian-10-cross-armv6l
+
+armv7l-debian-10-container:
+ extends: .container_job
+ variables:
+ NAME: debian-10-cross-armv7l
+
+i686-debian-10-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-10-cross-i686
+
+mips-debian-10-container:
+ extends: .container_job
+ variables:
+ NAME: debian-10-cross-mips
+
+mips64el-debian-10-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-10-cross-mips64el
+
+mipsel-debian-10-container:
+ extends: .container_job
+ variables:
+ NAME: debian-10-cross-mipsel
+
+ppc64le-debian-10-container:
+ extends: .container_job
+ variables:
+ NAME: debian-10-cross-ppc64le
+
+s390x-debian-10-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-10-cross-s390x
+
+aarch64-debian-sid-container:
+ extends: .container_job
+ variables:
+ NAME: debian-sid-cross-aarch64
+
+armv6l-debian-sid-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-sid-cross-armv6l
+
+armv7l-debian-sid-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-sid-cross-armv7l
+
+i686-debian-sid-container:
+ extends: .container_job
+ variables:
+ NAME: debian-sid-cross-i686
+
+mips64el-debian-sid-container:
+ extends: .container_job
+ variables:
+ NAME: debian-sid-cross-mips64el
+
+mipsel-debian-sid-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-sid-cross-mipsel
+
+ppc64le-debian-sid-container:
+ extends: .container_job
+ allow_failure: true
+ variables:
+ NAME: debian-sid-cross-ppc64le
+
+s390x-debian-sid-container:
+ extends: .container_job
+ variables:
+ NAME: debian-sid-cross-s390x
+
+mingw32-fedora-rawhide-container:
+ extends: .container_job
+ variables:
+ NAME: fedora-rawhide-cross-mingw32
+
+mingw64-fedora-rawhide-container:
+ extends: .container_job
+ variables:
+ NAME: fedora-rawhide-cross-mingw64
+
+# Native architecture build + test jobs
+
+x64-debian-10:
+ extends: .native_build_job
+ needs:
+ - x64-debian-10-container
+ variables:
+ NAME: debian-10
+
+x64-debian-10-clang:
+ extends: .native_build_job
+ needs:
+ - x64-debian-10-container
+ variables:
+ NAME: debian-10
+ CC: clang
+
+x64-debian-sid:
+ extends: .native_build_job
+ needs:
+ - x64-debian-sid-container
+ variables:
+ NAME: debian-sid
+
+x64-centos-8:
+ extends: .native_build_job
+ needs:
+ - x64-centos-8-container
+ variables:
+ NAME: centos-8
+
+x64-centos-8-clang:
+ extends: .native_build_job
+ needs:
+ - x64-centos-8-container
+ variables:
+ NAME: centos-8
+ CC: clang
+
+x64-centos-stream-8:
+ extends: .native_build_job
+ needs:
+ - x64-centos-stream-8-container
+ variables:
+ NAME: centos-stream-8
+
+x64-fedora-33:
+ extends: .native_build_job
+ needs:
+ - x64-fedora-33-container
+ variables:
+ NAME: fedora-33
+
+x64-fedora-34:
+ extends: .native_build_job
+ needs:
+ - x64-fedora-34-container
+ variables:
+ NAME: fedora-34
+
+x64-fedora-rawhide:
+ extends: .native_build_job
+ needs:
+ - x64-fedora-rawhide-container
+ variables:
+ NAME: fedora-rawhide
+
+x64-fedora-rawhide-clang:
+ extends: .native_build_job
+ needs:
+ - x64-fedora-rawhide-container
+ variables:
+ NAME: fedora-rawhide
+ CC: clang
+
+x64-opensuse-leap-152:
+ extends: .native_build_job
+ needs:
+ - x64-opensuse-leap-152-container
+ variables:
+ NAME: opensuse-leap-152
+
+x64-opensuse-tumbleweed:
+ extends: .native_build_job
+ needs:
+ - x64-opensuse-tumbleweed-container
+ variables:
+ NAME: opensuse-tumbleweed
+
+x64-ubuntu-1804:
+ extends: .native_build_job
+ needs:
+ - x64-ubuntu-1804-container
+ variables:
+ NAME: ubuntu-1804
+ GOLANG: skip
+
+x64-ubuntu-2004:
+ extends: .native_build_job
+ needs:
+ - x64-ubuntu-2004-container
+ variables:
+ NAME: ubuntu-2004
+
+x64-freebsd-12-build:
+ extends: .cirrus_build_job
+ variables:
+ NAME: freebsd-12
+ CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+ CIRRUS_VM_IMAGE_SELECTOR: image_family
+ CIRRUS_VM_IMAGE_NAME: freebsd-12-2
+ UPDATE_COMMAND: pkg update
+ INSTALL_COMMAND: pkg install -y
+
+x64-macos-11-build:
+ extends: .cirrus_build_job
+ allow_failure: true
+ variables:
+ NAME: macos-11
+ CIRRUS_VM_INSTANCE_TYPE: osx_instance
+ CIRRUS_VM_IMAGE_SELECTOR: image
+ CIRRUS_VM_IMAGE_NAME: big-sur-base
+ UPDATE_COMMAND: brew update
+ INSTALL_COMMAND: brew install
+ PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
+ PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+
+
+# Cross compiled build jobs
+
+aarch64-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - aarch64-debian-sid-container
+ variables:
+ NAME: debian-sid
+ CROSS: aarch64
+
+armv6l-debian-10:
+ extends: .cross_build_job
+ needs:
+ - armv6l-debian-10-container
+ variables:
+ NAME: debian-10
+ CROSS: armv6l
+
+armv7l-debian-10:
+ extends: .cross_build_job
+ needs:
+ - armv7l-debian-10-container
+ variables:
+ NAME: debian-10
+ CROSS: armv7l
+
+i686-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - i686-debian-sid-container
+ variables:
+ NAME: debian-sid
+ CROSS: i686
+
+mips-debian-10:
+ extends: .cross_build_job
+ needs:
+ - mips-debian-10-container
+ variables:
+ NAME: debian-10
+ CROSS: mips
+
+mips64el-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - mips64el-debian-sid-container
+ variables:
+ NAME: debian-sid
+ CROSS: mips64el
+
+mipsel-debian-10:
+ extends: .cross_build_job
+ needs:
+ - mipsel-debian-10-container
+ variables:
+ NAME: debian-10
+ CROSS: mipsel
+
+ppc64le-debian-10:
+ extends: .cross_build_job
+ needs:
+ - ppc64le-debian-10-container
+ variables:
+ NAME: debian-10
+ CROSS: ppc64le
+
+s390x-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - s390x-debian-sid-container
+ variables:
+ NAME: debian-sid
+ CROSS: s390x
+
+mingw32-fedora-rawhide:
+ extends: .cross_build_job
+ allow_failure: true
+ needs:
+ - mingw32-fedora-rawhide-container
+ variables:
+ NAME: fedora-rawhide
+ CROSS: mingw32
+
+mingw64-fedora-rawhide:
+ extends: .cross_build_job
+ allow_failure: true
+ needs:
+ - mingw64-fedora-rawhide-container
+ variables:
+ NAME: fedora-rawhide
+ CROSS: mingw64
diff --git a/ci/build_script.sh b/ci/build_script.sh
new file mode 100755
index 000000000000..a27f80251cd0
--- /dev/null
+++ b/ci/build_script.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+main() {
+ autoreconf -if
+
+ CONFIG_ARGS="--enable-gcc-warnings --enable-fuse --enable-ocaml --enable-python
--enable-golang --with-gnutls --with-libxml2"
+
+ if test "$GOLANG" != "skip"
+ then
+ CONFIG_ARGS="$CONFIG_ARGS --enable-golang"
+ fi
+
+ ./configure $CONFIG_ARGS
+
+ $MAKE
+
+ if test -n "$CROSS"
+ then
+ return 0
+ fi
+
+ $MAKE check || { find . -name test-suite.log -exec grep -l '^X\?FAIL:'
'{}' \+ | xargs cat; exit 1; }
+
+ if test "$CHECK_VALGRIND" = "force"
+ then
+ $MAKE check-valgrind
+ fi
+
+ if test "$DIST" != "skip"
+ then
+ $MAKE dist
+ $MAKE maintainer-check-extra-dist
+ fi
+
+ if test "$DISTCHECK" = "force"
+ then
+ $MAKE distcheck
+ fi
+}
+
+main "$@"
diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml
new file mode 100644
index 000000000000..5a5c65e3b640
--- /dev/null
+++ b/ci/cirrus/build.yml
@@ -0,0 +1,22 @@
+@CIRRUS_VM_INSTANCE_TYPE@:
+ @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@
+
+env:
+ CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@"
+ CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@"
+ CI_COMMIT_SHA: "@CI_COMMIT_SHA@"
+ PATH: "@PATH@"
+ PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@"
+ PYTHON: "@PYTHON@"
+ MAKE: "@MAKE@"
+
+build_task:
+ install_script:
+ - @INSTALL_COMMAND@ @PKGS@
+ - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi
+ clone_script:
+ - git clone --depth 100 "$CI_REPOSITORY_URL" .
+ - git fetch origin "$CI_COMMIT_REF_NAME"
+ - git reset --hard "$CI_COMMIT_SHA"
+ build_script:
+ - ci/build_script.sh
diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
new file mode 100644
index 000000000000..4e7f653a859c
--- /dev/null
+++ b/ci/cirrus/freebsd-12.vars
@@ -0,0 +1,14 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool variables freebsd-12 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621...
+
+PACKAGING_COMMAND='pkg'
+CC='/usr/bin/clang'
+CCACHE='/usr/local/bin/ccache'
+MAKE='/usr/local/bin/gmake'
+NINJA='/usr/local/bin/ninja'
+PYTHON='/usr/local/bin/python3'
+PIP3='/usr/local/bin/pip-3.7'
+PKGS='autoconf automake bash-completion ca_root_nss ccache coreutils diffutils
fusefs-libs git glib gmake gnutls go gsed libev libtool libxml2 nbdkit ocaml ocaml-findlib
perl5 pkgconf python3 qemu'
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
new file mode 100644
index 000000000000..dfdf58e8616b
--- /dev/null
+++ b/ci/cirrus/freebsd-current.vars
@@ -0,0 +1,14 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool variables freebsd-current libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621...
+
+PACKAGING_COMMAND='pkg'
+CC='/usr/bin/clang'
+CCACHE='/usr/local/bin/ccache'
+MAKE='/usr/local/bin/gmake'
+NINJA='/usr/local/bin/ninja'
+PYTHON='/usr/local/bin/python3'
+PIP3='/usr/local/bin/pip-3.7'
+PKGS='autoconf automake bash-completion ca_root_nss ccache coreutils diffutils
fusefs-libs git glib gmake gnutls go gsed libev libtool libxml2 nbdkit ocaml ocaml-findlib
perl5 pkgconf python3 qemu'
diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars
new file mode 100644
index 000000000000..413a203782eb
--- /dev/null
+++ b/ci/cirrus/macos-11.vars
@@ -0,0 +1,14 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool variables macos-11 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621...
+
+PACKAGING_COMMAND='brew'
+CC='/usr/bin/clang'
+CCACHE='/usr/local/bin/ccache'
+MAKE='/usr/local/bin/gmake'
+NINJA='/usr/local/bin/ninja'
+PYTHON='/usr/local/bin/python3'
+PIP3='/usr/local/bin/pip3'
+PKGS='autoconf automake bash-completion ccache coreutils diffutils git glib gnu-sed
gnutls golang libev libtool libxml2 make ocaml ocaml-findlib perl pkg-config python3
qemu'
diff --git a/ci/cirrus/refresh b/ci/cirrus/refresh
new file mode 100755
index 000000000000..459cd80d0934
--- /dev/null
+++ b/ci/cirrus/refresh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if test -z "$1"
+then
+ echo "syntax: $0 PATH-TO-LCITOOL"
+ exit 1
+fi
+
+LCITOOL=$1
+
+if ! test -x "$LCITOOL"
+then
+ echo "$LCITOOL is not executable"
+ exit 1
+fi
+
+HOSTS=$($LCITOOL hosts | grep -E 'freebsd|macos')
+
+for host in $HOSTS
+do
+ $LCITOOL variables "$host" libnbd >"$host.vars"
+done
diff --git a/ci/containers/README.rst b/ci/containers/README.rst
new file mode 100644
index 000000000000..530897e311f5
--- /dev/null
+++ b/ci/containers/README.rst
@@ -0,0 +1,14 @@
+CI job assets
+=============
+
+This directory contains assets used in the automated CI jobs, most
+notably the Dockerfiles used to build container images in which the
+CI jobs then run.
+
+The ``refresh`` script is used to re-create the Dockerfiles using the
+``lcitool`` command that is provided by repo
+https://gitlab.com/libvirt/libvirt-ci
+
+The containers are built during the CI process and cached in the GitLab
+container registry of the project doing the build. The cached containers
+can be deleted at any time and will be correctly rebuilt.
diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
new file mode 100644
index 000000000000..867f0507d172
--- /dev/null
+++ b/ci/containers/centos-8.Dockerfile
@@ -0,0 +1,61 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile centos-8 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/centos:8
+
+RUN dnf update -y && \
+ dnf install 'dnf-command(config-manager)' -y && \
+ dnf config-manager --set-enabled -y powertools && \
+ dnf install -y centos-release-advanced-virtualization && \
+ dnf install -y epel-release && \
+ dnf install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils-single \
+ diffutils \
+ fuse3-devel \
+ gcc \
+ gcc-c++ \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ gnutls \
+ gnutls-devel \
+ golang \
+ iproute \
+ jq \
+ libev-devel \
+ libtool \
+ libxml2-devel \
+ make \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl \
+ pkgconfig \
+ python3-devel \
+ python3-flake8 \
+ qemu-img \
+ qemu-kvm \
+ sed && \
+ dnf autoremove -y && \
+ dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/centos-stream-8.Dockerfile
b/ci/containers/centos-stream-8.Dockerfile
new file mode 100644
index 000000000000..f210948ffd40
--- /dev/null
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -0,0 +1,61 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile centos-stream-8 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM quay.io/centos/centos:stream8
+
+RUN dnf update -y && \
+ dnf install 'dnf-command(config-manager)' -y && \
+ dnf config-manager --set-enabled -y powertools && \
+ dnf install -y centos-release-advanced-virtualization && \
+ dnf install -y epel-release && \
+ dnf install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils-single \
+ diffutils \
+ fuse3-devel \
+ gcc \
+ gcc-c++ \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ gnutls \
+ gnutls-devel \
+ golang \
+ iproute \
+ jq \
+ libev-devel \
+ libtool \
+ libxml2-devel \
+ make \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl \
+ pkgconfig \
+ python3-devel \
+ python3-flake8 \
+ qemu-img \
+ qemu-kvm \
+ sed && \
+ dnf autoremove -y && \
+ dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile
b/ci/containers/debian-10-cross-aarch64.Dockerfile
new file mode 100644
index 000000000000..cc765f32fd1c
--- /dev/null
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross aarch64 debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture arm64 && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-aarch64-linux-gnu \
+ gcc-aarch64-linux-gnu \
+ libc6-dev:arm64 \
+ libev-dev:arm64 \
+ libfuse3-dev:arm64 \
+ libglib2.0-dev:arm64 \
+ libgnutls28-dev:arm64 \
+ libxml2-dev:arm64 && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
+ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'aarch64'\n\
+cpu = 'aarch64'\n\
+endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "aarch64-linux-gnu"
+ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile
b/ci/containers/debian-10-cross-armv6l.Dockerfile
new file mode 100644
index 000000000000..200d0277cc44
--- /dev/null
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross armv6l debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture armel && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-arm-linux-gnueabi \
+ gcc-arm-linux-gnueabi \
+ libc6-dev:armel \
+ libev-dev:armel \
+ libfuse3-dev:armel \
+ libglib2.0-dev:armel \
+ libgnutls28-dev:armel \
+ libxml2-dev:armel && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'arm'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "arm-linux-gnueabi"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile
b/ci/containers/debian-10-cross-armv7l.Dockerfile
new file mode 100644
index 000000000000..71bab34202df
--- /dev/null
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross armv7l debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-g++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture armhf && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-arm-linux-gnueabihf \
+ gcc-arm-linux-gnueabihf \
+ libc6-dev:armhf \
+ libev-dev:armhf \
+ libfuse3-dev:armhf \
+ libglib2.0-dev:armhf \
+ libgnutls28-dev:armhf \
+ libxml2-dev:armhf && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'armhf'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "arm-linux-gnueabihf"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile
b/ci/containers/debian-10-cross-i686.Dockerfile
new file mode 100644
index 000000000000..21f687fa6d4b
--- /dev/null
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross i686 debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture i386 && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-i686-linux-gnu \
+ gcc-i686-linux-gnu \
+ libc6-dev:i386 \
+ libev-dev:i386 \
+ libfuse3-dev:i386 \
+ libglib2.0-dev:i386 \
+ libgnutls28-dev:i386 \
+ libxml2-dev:i386 && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/i686-linux-gnu-gcc'\n\
+ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/i686-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'x86'\n\
+cpu = 'i686'\n\
+endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "i686-linux-gnu"
+ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile
b/ci/containers/debian-10-cross-mips.Dockerfile
new file mode 100644
index 000000000000..dd82c077411b
--- /dev/null
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross mips debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture mips && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-mips-linux-gnu \
+ gcc-mips-linux-gnu \
+ libc6-dev:mips \
+ libev-dev:mips \
+ libfuse3-dev:mips \
+ libglib2.0-dev:mips \
+ libgnutls28-dev:mips \
+ libxml2-dev:mips && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/mips-linux-gnu-gcc'\n\
+ar = '/usr/bin/mips-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/mips-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips'\n\
+cpu = 'mips'\n\
+endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "mips-linux-gnu"
+ENV CONFIGURE_OPTS "--host=mips-linux-gnu"
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile
b/ci/containers/debian-10-cross-mips64el.Dockerfile
new file mode 100644
index 000000000000..31d0768c4b0c
--- /dev/null
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross mips64el debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-g++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture mips64el && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-mips64el-linux-gnuabi64 \
+ gcc-mips64el-linux-gnuabi64 \
+ libc6-dev:mips64el \
+ libev-dev:mips64el \
+ libfuse3-dev:mips64el \
+ libglib2.0-dev:mips64el \
+ libgnutls28-dev:mips64el \
+ libxml2-dev:mips64el && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
+ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
+strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
+pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips64'\n\
+cpu = 'mips64el'\n\
+endian = 'little'" >
/usr/local/share/meson/cross/mips64el-linux-gnuabi64
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "mips64el-linux-gnuabi64"
+ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile
b/ci/containers/debian-10-cross-mipsel.Dockerfile
new file mode 100644
index 000000000000..45dd872e7056
--- /dev/null
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross mipsel debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture mipsel && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-mipsel-linux-gnu \
+ gcc-mipsel-linux-gnu \
+ libc6-dev:mipsel \
+ libev-dev:mipsel \
+ libfuse3-dev:mipsel \
+ libglib2.0-dev:mipsel \
+ libgnutls28-dev:mipsel \
+ libxml2-dev:mipsel && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
+ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips'\n\
+cpu = 'mipsel'\n\
+endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "mipsel-linux-gnu"
+ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile
b/ci/containers/debian-10-cross-ppc64le.Dockerfile
new file mode 100644
index 000000000000..391d3c69ac49
--- /dev/null
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross ppc64le debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-g++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture ppc64el && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-powerpc64le-linux-gnu \
+ gcc-powerpc64le-linux-gnu \
+ libc6-dev:ppc64el \
+ libev-dev:ppc64el \
+ libfuse3-dev:ppc64el \
+ libglib2.0-dev:ppc64el \
+ libgnutls28-dev:ppc64el \
+ libxml2-dev:ppc64el && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
+ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'ppc64'\n\
+cpu = 'powerpc64le'\n\
+endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "powerpc64le-linux-gnu"
+ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile
b/ci/containers/debian-10-cross-s390x.Dockerfile
new file mode 100644
index 000000000000..b11bc509fd2c
--- /dev/null
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross s390x debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture s390x && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-s390x-linux-gnu \
+ gcc-s390x-linux-gnu \
+ libc6-dev:s390x \
+ libev-dev:s390x \
+ libfuse3-dev:s390x \
+ libglib2.0-dev:s390x \
+ libgnutls28-dev:s390x \
+ libxml2-dev:s390x && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/s390x-linux-gnu-gcc'\n\
+ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/s390x-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 's390x'\n\
+cpu = 's390x'\n\
+endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "s390x-linux-gnu"
+ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
new file mode 100644
index 000000000000..649c64adc46b
--- /dev/null
+++ b/ci/containers/debian-10.Dockerfile
@@ -0,0 +1,64 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile debian-10 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:10-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ flake8 \
+ g++ \
+ gcc \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libc6-dev \
+ libev-dev \
+ libfuse3-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ libtool-bin \
+ libxml2-dev \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile
b/ci/containers/debian-sid-cross-aarch64.Dockerfile
new file mode 100644
index 000000000000..f9afd0eb16ed
--- /dev/null
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross aarch64 debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture arm64 && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-aarch64-linux-gnu \
+ gcc-aarch64-linux-gnu \
+ libc6-dev:arm64 \
+ libev-dev:arm64 \
+ libfuse3-dev:arm64 \
+ libglib2.0-dev:arm64 \
+ libgnutls28-dev:arm64 \
+ libxml2-dev:arm64 && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
+ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'aarch64'\n\
+cpu = 'aarch64'\n\
+endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "aarch64-linux-gnu"
+ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile
b/ci/containers/debian-sid-cross-armv6l.Dockerfile
new file mode 100644
index 000000000000..d637036b0444
--- /dev/null
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross armv6l debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture armel && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-arm-linux-gnueabi \
+ gcc-arm-linux-gnueabi \
+ libc6-dev:armel \
+ libev-dev:armel \
+ libfuse3-dev:armel \
+ libglib2.0-dev:armel \
+ libgnutls28-dev:armel \
+ libxml2-dev:armel && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'arm'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "arm-linux-gnueabi"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile
b/ci/containers/debian-sid-cross-armv7l.Dockerfile
new file mode 100644
index 000000000000..6934b32f1eba
--- /dev/null
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross armv7l debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-g++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture armhf && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-arm-linux-gnueabihf \
+ gcc-arm-linux-gnueabihf \
+ libc6-dev:armhf \
+ libev-dev:armhf \
+ libfuse3-dev:armhf \
+ libglib2.0-dev:armhf \
+ libgnutls28-dev:armhf \
+ libxml2-dev:armhf && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'armhf'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "arm-linux-gnueabihf"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile
b/ci/containers/debian-sid-cross-i686.Dockerfile
new file mode 100644
index 000000000000..01bd3b48bc02
--- /dev/null
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross i686 debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture i386 && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-i686-linux-gnu \
+ gcc-i686-linux-gnu \
+ libc6-dev:i386 \
+ libev-dev:i386 \
+ libfuse3-dev:i386 \
+ libglib2.0-dev:i386 \
+ libgnutls28-dev:i386 \
+ libxml2-dev:i386 && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/i686-linux-gnu-gcc'\n\
+ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/i686-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'x86'\n\
+cpu = 'i686'\n\
+endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "i686-linux-gnu"
+ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile
b/ci/containers/debian-sid-cross-mips64el.Dockerfile
new file mode 100644
index 000000000000..7c3057503b60
--- /dev/null
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross mips64el debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-g++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture mips64el && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-mips64el-linux-gnuabi64 \
+ gcc-mips64el-linux-gnuabi64 \
+ libc6-dev:mips64el \
+ libev-dev:mips64el \
+ libfuse3-dev:mips64el \
+ libglib2.0-dev:mips64el \
+ libgnutls28-dev:mips64el \
+ libxml2-dev:mips64el && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
+ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
+strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
+pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips64'\n\
+cpu = 'mips64el'\n\
+endian = 'little'" >
/usr/local/share/meson/cross/mips64el-linux-gnuabi64
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "mips64el-linux-gnuabi64"
+ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile
b/ci/containers/debian-sid-cross-mipsel.Dockerfile
new file mode 100644
index 000000000000..813059edfafe
--- /dev/null
+++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross mipsel debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture mipsel && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-mipsel-linux-gnu \
+ gcc-mipsel-linux-gnu \
+ libc6-dev:mipsel \
+ libev-dev:mipsel \
+ libfuse3-dev:mipsel \
+ libglib2.0-dev:mipsel \
+ libgnutls28-dev:mipsel \
+ libxml2-dev:mipsel && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
+ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips'\n\
+cpu = 'mipsel'\n\
+endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "mipsel-linux-gnu"
+ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
new file mode 100644
index 000000000000..b8715dc4809f
--- /dev/null
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross ppc64le debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-g++
&& \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture ppc64el && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-powerpc64le-linux-gnu \
+ gcc-powerpc64le-linux-gnu \
+ libc6-dev:ppc64el \
+ libev-dev:ppc64el \
+ libfuse3-dev:ppc64el \
+ libglib2.0-dev:ppc64el \
+ libgnutls28-dev:ppc64el \
+ libxml2-dev:ppc64el && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
+ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'ppc64'\n\
+cpu = 'powerpc64le'\n\
+endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "powerpc64le-linux-gnu"
+ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile
b/ci/containers/debian-sid-cross-s390x.Dockerfile
new file mode 100644
index 000000000000..7fcc77758e65
--- /dev/null
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@@ -0,0 +1,86 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross s390x debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ flake8 \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libtool-bin \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ dpkg --add-architecture s390x && \
+ eatmydata apt-get update && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
+ eatmydata apt-get install --no-install-recommends -y \
+ g++-s390x-linux-gnu \
+ gcc-s390x-linux-gnu \
+ libc6-dev:s390x \
+ libev-dev:s390x \
+ libfuse3-dev:s390x \
+ libglib2.0-dev:s390x \
+ libgnutls28-dev:s390x \
+ libxml2-dev:s390x && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ mkdir -p /usr/local/share/meson/cross && \
+ echo "[binaries]\n\
+c = '/usr/bin/s390x-linux-gnu-gcc'\n\
+ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/s390x-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 's390x'\n\
+cpu = 's390x'\n\
+endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "s390x-linux-gnu"
+ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
new file mode 100644
index 000000000000..c5257651016d
--- /dev/null
+++ b/ci/containers/debian-sid.Dockerfile
@@ -0,0 +1,64 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile debian-sid libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/debian:sid-slim
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ flake8 \
+ g++ \
+ gcc \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libc6-dev \
+ libev-dev \
+ libfuse3-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ libtool-bin \
+ libxml2-dev \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile
new file mode 100644
index 000000000000..c25eb91e5276
--- /dev/null
+++ b/ci/containers/fedora-33.Dockerfile
@@ -0,0 +1,68 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile fedora-33 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM registry.fedoraproject.org/fedora:33
+
+RUN dnf install -y nosync && \
+ echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+ chmod +x /usr/bin/nosync && \
+ nosync dnf update -y && \
+ nosync dnf install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ fuse3-devel \
+ gcc \
+ gcc-c++ \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ gnutls \
+ gnutls-devel \
+ golang \
+ iproute \
+ jq \
+ libev-devel \
+ libtool \
+ libxml2-devel \
+ make \
+ nbd \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconfig \
+ python3-devel \
+ python3-flake8 \
+ qemu-img \
+ qemu-kvm \
+ sed && \
+ nosync dnf autoremove -y && \
+ nosync dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
new file mode 100644
index 000000000000..d5e1d46156bd
--- /dev/null
+++ b/ci/containers/fedora-34.Dockerfile
@@ -0,0 +1,68 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile fedora-34 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM registry.fedoraproject.org/fedora:34
+
+RUN dnf install -y nosync && \
+ echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+ chmod +x /usr/bin/nosync && \
+ nosync dnf update -y && \
+ nosync dnf install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ fuse3-devel \
+ gcc \
+ gcc-c++ \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ gnutls \
+ gnutls-devel \
+ golang \
+ iproute \
+ jq \
+ libev-devel \
+ libtool \
+ libxml2-devel \
+ make \
+ nbd \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconfig \
+ python3-devel \
+ python3-flake8 \
+ qemu-img \
+ qemu-kvm \
+ sed && \
+ nosync dnf autoremove -y && \
+ nosync dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
new file mode 100644
index 000000000000..a7f1f95ac4d6
--- /dev/null
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -0,0 +1,71 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross mingw32 fedora-rawhide libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM registry.fedoraproject.org/fedora:rawhide
+
+RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
+ dnf install -y nosync && \
+ echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+ chmod +x /usr/bin/nosync && \
+ nosync dnf update -y && \
+ nosync dnf install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ git \
+ glibc-langpack-en \
+ gnutls \
+ golang \
+ iproute \
+ jq \
+ libtool \
+ make \
+ nbd \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ python3-devel \
+ python3-flake8 \
+ qemu-img \
+ qemu-kvm \
+ sed && \
+ nosync dnf autoremove -y && \
+ nosync dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
+
+RUN nosync dnf install -y \
+ mingw32-gcc \
+ mingw32-gcc-c++ \
+ mingw32-glib2 \
+ mingw32-gnutls \
+ mingw32-headers \
+ mingw32-libxml2 \
+ mingw32-pkg-config && \
+ nosync dnf clean all -y
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "i686-w64-mingw32"
+ENV CONFIGURE_OPTS "--host=i686-w64-mingw32"
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
new file mode 100644
index 000000000000..549ed3558bb4
--- /dev/null
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -0,0 +1,71 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --cross mingw64 fedora-rawhide libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM registry.fedoraproject.org/fedora:rawhide
+
+RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
+ dnf install -y nosync && \
+ echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+ chmod +x /usr/bin/nosync && \
+ nosync dnf update -y && \
+ nosync dnf install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ coreutils \
+ diffutils \
+ git \
+ glibc-langpack-en \
+ gnutls \
+ golang \
+ iproute \
+ jq \
+ libtool \
+ make \
+ nbd \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ python3-devel \
+ python3-flake8 \
+ qemu-img \
+ qemu-kvm \
+ sed && \
+ nosync dnf autoremove -y && \
+ nosync dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-c++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-g++ &&
\
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
+
+RUN nosync dnf install -y \
+ mingw64-gcc \
+ mingw64-gcc-c++ \
+ mingw64-glib2 \
+ mingw64-gnutls \
+ mingw64-headers \
+ mingw64-libxml2 \
+ mingw64-pkg-config && \
+ nosync dnf clean all -y
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
+ENV ABI "x86_64-w64-mingw32"
+ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32"
diff --git a/ci/containers/fedora-rawhide.Dockerfile
b/ci/containers/fedora-rawhide.Dockerfile
new file mode 100644
index 000000000000..2de1ec474db5
--- /dev/null
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -0,0 +1,69 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile fedora-rawhide libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM registry.fedoraproject.org/fedora:rawhide
+
+RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
+ dnf install -y nosync && \
+ echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+ chmod +x /usr/bin/nosync && \
+ nosync dnf update -y && \
+ nosync dnf install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ fuse3-devel \
+ gcc \
+ gcc-c++ \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ gnutls \
+ gnutls-devel \
+ golang \
+ iproute \
+ jq \
+ libev-devel \
+ libtool \
+ libxml2-devel \
+ make \
+ nbd \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconfig \
+ python3-devel \
+ python3-flake8 \
+ qemu-img \
+ qemu-kvm \
+ sed && \
+ nosync dnf autoremove -y && \
+ nosync dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/opensuse-leap-152.Dockerfile
b/ci/containers/opensuse-leap-152.Dockerfile
new file mode 100644
index 000000000000..b80e4e3ee85c
--- /dev/null
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -0,0 +1,56 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile opensuse-leap-152 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM registry.opensuse.org/opensuse/leap:15.2
+
+RUN zypper update -y && \
+ zypper install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ fuse3-devel \
+ gcc \
+ gcc-c++ \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-locale \
+ gnutls \
+ go \
+ iproute2 \
+ jq \
+ libev-devel \
+ libgnutls-devel \
+ libtool \
+ libxml2-devel \
+ make \
+ nbd \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconfig \
+ python3-devel \
+ python3-flake8 \
+ qemu-kvm \
+ qemu-tools \
+ sed && \
+ zypper clean --all && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile
b/ci/containers/opensuse-tumbleweed.Dockerfile
new file mode 100644
index 000000000000..5d9479f390dc
--- /dev/null
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -0,0 +1,57 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile opensuse-tumbleweed libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM registry.opensuse.org/opensuse/tumbleweed:latest
+
+RUN zypper update -y && \
+ zypper install -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ fuse3-devel \
+ gcc \
+ gcc-c++ \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-locale \
+ gnutls \
+ go \
+ iproute2 \
+ jq \
+ libev-devel \
+ libgnutls-devel \
+ libtool \
+ libxml2-devel \
+ make \
+ nbd \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconfig \
+ python3-devel \
+ python3-flake8 \
+ qemu-kvm \
+ qemu-tools \
+ sed && \
+ zypper clean --all && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/refresh b/ci/containers/refresh
new file mode 100755
index 000000000000..327f642ed2ec
--- /dev/null
+++ b/ci/containers/refresh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+if test -z "$1"
+then
+ echo "syntax: $0 PATH-TO-LCITOOL"
+ exit 1
+fi
+
+LCITOOL=$1
+
+if ! test -x "$LCITOOL"
+then
+ echo "$LCITOOL is not executable"
+ exit 1
+fi
+
+HOSTS=$($LCITOOL hosts | grep -Ev 'freebsd|macos')
+
+for host in $HOSTS
+do
+ case "$host" in
+ fedora-rawhide)
+ for cross in mingw32 mingw64
+ do
+ $LCITOOL dockerfile $host libnbd --cross $cross >
$host-cross-$cross.Dockerfile
+ done
+ ;;
+ debian-*)
+ for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x
+ do
+ if test "$host-cross-$cross" = "debian-9-cross-i686" ||
+ test "$host-cross-$cross" = "debian-sid-cross-mips"
+ then
+ continue
+ fi
+ $LCITOOL dockerfile $host libnbd --cross $cross >
$host-cross-$cross.Dockerfile
+ done
+ ;;
+ esac
+
+ $LCITOOL dockerfile $host libnbd > $host.Dockerfile
+done
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
new file mode 100644
index 000000000000..3f626cc2406d
--- /dev/null
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -0,0 +1,62 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile ubuntu-1804 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/ubuntu:18.04
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ flake8 \
+ g++ \
+ gcc \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libc6-dev \
+ libev-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ libtool-bin \
+ libxml2-dev \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
new file mode 100644
index 000000000000..bf0650ac4bee
--- /dev/null
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -0,0 +1,64 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile ubuntu-2004 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
+
+FROM docker.io/library/ubuntu:20.04
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ coreutils \
+ diffutils \
+ flake8 \
+ g++ \
+ gcc \
+ git \
+ gnutls-bin \
+ golang \
+ iproute2 \
+ jq \
+ libc6-dev \
+ libev-dev \
+ libfuse3-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ libtool-bin \
+ libxml2-dev \
+ locales \
+ make \
+ nbd-client \
+ nbd-server \
+ nbdkit \
+ ocaml \
+ ocaml-findlib \
+ perl-base \
+ pkgconf \
+ python3-dev \
+ qemu-kvm \
+ qemu-utils \
+ sed && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show >
/packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--
2.31.1
12:30 p.m.
New subject: [libnbd PATCH 5/5] Introduction of automated testing
On 5/6/21 6:30 AM, Martin Kletzander wrote:
This setup uses the libvirt-ci to get as much coverage as possible
with the ease
of use provided by that repository. Not all the data are available there at the
time of posting this patch, so if anyone wants to recreate the Containerfiles
and variable files (for cirrus CI) my temporary branch of libvirt-ci called
nbd_prep has all the work that is going to be proposed for inclusion there once
this goes in:
https://gitlab.com/nertpinx/libvirt-ci/-/tree/nbd_prep
The result of this branch CI run is available here:
https://gitlab.com/nertpinx/libnbd/-/pipelines
If there are any questions related to how the CI is running, how it
works, how to replicate CI builds locally or how to change anything,
then I am more than happy to help.
Actually recreating the builds locally (at least for Linux distributions
and setups) is pretty straightforward. Choose a file from ci/containers
which represents the desired setup, for our example let's pick fedora
rawhide, and build your container and tag it, e.g. using podman (or feel
free to substitute "podman" with "docker"):
podman build ci/containers/fedora-33.Dockerfile -t libnbd-fedora-rawhide
Gave me an error message:
Error: context must be a directory:
"/home/eblake/libnbd/ci/containers/ubuntu-1804.Dockerfile"
I'm assuming you meant 'podman build -f ci/...'
That will get you a container tagged `libnbd-fedora-rawhide` that you
can execute the tests on. You can then run whatever you want inside
that container with the current repository passed through like this:
podman run -it --rm -v .:/repo -w /repo libnbd-fedora-rawhide bash
I'm getting:
root@ccd5058d1cf8:/repo# cd /repo
root@ccd5058d1cf8:/repo# ls
ls: cannot open directory '.': Permission denied
root@ccd5058d1cf8:/repo# cd /
root@ccd5058d1cf8:/# ls /repo
ls: cannot open directory '/repo': Permission denied
when running that command line as a non-root user in the host. Am I
missing a setup step?
which will bind-mount the current directory onto /repo inside the
container and also use that path as the working directory (just so you
do not have to `cd /repo` before any commands. I prefer running bash,
but of course you can just run the build script used in the CI. I have
put all the CI build commands into one file for simplicity, so that you
can simply run `ci/build_script.sh`. Executing that script will give
you the results and you can experiment right inside that environment to
figure out what is needed. At the same time you can easily modify any
files inside that repository on your host, just like you are used to, so
that you can use your editor and other setups that work for you. Just
make sure that build files do not interfere between the host and the
container, if you want to replicate a clean build you need to either use
VPATH or just clean everything.
Let me know what you think, and have a nice day.
+++ b/ci/build_script.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+main() {
+ autoreconf -if
+
+ CONFIG_ARGS="--enable-gcc-warnings --enable-fuse --enable-ocaml --enable-python
--enable-golang --with-gnutls --with-libxml2"
Long line; worth splitting with \-newline?
+
+ if test "$GOLANG" != "skip"
+ then
+ CONFIG_ARGS="$CONFIG_ARGS --enable-golang"
+ fi
+
+ ./configure $CONFIG_ARGS
+
+ $MAKE
+
+ if test -n "$CROSS"
+ then
+ return 0
+ fi
+
+ $MAKE check || { find . -name test-suite.log -exec grep -l '^X\?FAIL:'
'{}' \+ | xargs cat; exit 1; }
and another
+
+ if test "$CHECK_VALGRIND" = "force"
+ then
+ $MAKE check-valgrind
+ fi
+
+ if test "$DIST" != "skip"
+ then
+ $MAKE dist
+ $MAKE maintainer-check-extra-dist
+ fi
+
+ if test "$DISTCHECK" = "force"
+ then
+ $MAKE distcheck
+ fi
+}
+
+main "$@"
Didn't see any bashisms, so keeping this /bin/sh seems fine.
+++ b/ci/containers/centos-8.Dockerfile
@@ -0,0 +1,61 @@
+# THIS FILE WAS AUTO-GENERATED
+#
Do we really want to check in auto-generated files into git?
+# $ lcitool dockerfile centos-8 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
You do have a point, however, that libvirt-ci (and in particular, a VERY
recent non-released commit) is not standard on other machines, so
checking them in makes life easier.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
3:42 p.m.
New subject: [libnbd PATCH 5/5] Introduction of automated testing
On Fri, May 07, 2021 at 12:30:41PM -0500, Eric Blake wrote:
On 5/6/21 6:30 AM, Martin Kletzander wrote:
> This setup uses the libvirt-ci to get as much coverage as possible with the ease
> of use provided by that repository. Not all the data are available there at the
> time of posting this patch, so if anyone wants to recreate the Containerfiles
> and variable files (for cirrus CI) my temporary branch of libvirt-ci called
> nbd_prep has all the work that is going to be proposed for inclusion there once
> this goes in:
>
> https://gitlab.com/nertpinx/libvirt-ci/-/tree/nbd_prep
>
> The result of this branch CI run is available here:
>
> https://gitlab.com/nertpinx/libnbd/-/pipelines
>
> If there are any questions related to how the CI is running, how it
> works, how to replicate CI builds locally or how to change anything,
> then I am more than happy to help.
>
> Actually recreating the builds locally (at least for Linux distributions
> and setups) is pretty straightforward. Choose a file from ci/containers
> which represents the desired setup, for our example let's pick fedora
> rawhide, and build your container and tag it, e.g. using podman (or feel
> free to substitute "podman" with "docker"):
>
> podman build ci/containers/fedora-33.Dockerfile -t libnbd-fedora-rawhide
Gave me an error message:
Error: context must be a directory:
"/home/eblake/libnbd/ci/containers/ubuntu-1804.Dockerfile"
I'm assuming you meant 'podman build -f ci/...'
Yep, it's missing `-f` in the command.
>
> That will get you a container tagged `libnbd-fedora-rawhide` that you
> can execute the tests on. You can then run whatever you want inside
> that container with the current repository passed through like this:
>
> podman run -it --rm -v .:/repo -w /repo libnbd-fedora-rawhide bash
I'm getting:
root@ccd5058d1cf8:/repo# cd /repo
root@ccd5058d1cf8:/repo# ls
ls: cannot open directory '.': Permission denied
root@ccd5058d1cf8:/repo# cd /
root@ccd5058d1cf8:/# ls /repo
ls: cannot open directory '/repo': Permission denied
when running that command line as a non-root user in the host. Am I
missing a setup step?
It might be SELinux related, the command might need something like:
-v .:/repo:Z
instead, so that it is relabelled properly.
Or maybe, but very improbably,
-v .:/repo:Z,U
I did not have to use that on non-SELinux system so I guess the U flag
is not needed.
>
> which will bind-mount the current directory onto /repo inside the
> container and also use that path as the working directory (just so you
> do not have to `cd /repo` before any commands. I prefer running bash,
> but of course you can just run the build script used in the CI. I have
> put all the CI build commands into one file for simplicity, so that you
> can simply run `ci/build_script.sh`. Executing that script will give
> you the results and you can experiment right inside that environment to
> figure out what is needed. At the same time you can easily modify any
> files inside that repository on your host, just like you are used to, so
> that you can use your editor and other setups that work for you. Just
> make sure that build files do not interfere between the host and the
> container, if you want to replicate a clean build you need to either use
> VPATH or just clean everything.
>
> Let me know what you think, and have a nice day.
>
> +++ b/ci/build_script.sh
> @@ -0,0 +1,43 @@
> +#!/bin/sh
> +
> +set -e
> +
> +main() {
> + autoreconf -if
> +
> + CONFIG_ARGS="--enable-gcc-warnings --enable-fuse --enable-ocaml
--enable-python --enable-golang --with-gnutls --with-libxml2"
Long line; worth splitting with \-newline?
> +
> + if test "$GOLANG" != "skip"
> + then
> + CONFIG_ARGS="$CONFIG_ARGS --enable-golang"
> + fi
> +
> + ./configure $CONFIG_ARGS
> +
> + $MAKE
> +
> + if test -n "$CROSS"
> + then
> + return 0
> + fi
> +
> + $MAKE check || { find . -name test-suite.log -exec grep -l '^X\?FAIL:'
'{}' \+ | xargs cat; exit 1; }
and another
> +
> + if test "$CHECK_VALGRIND" = "force"
> + then
> + $MAKE check-valgrind
> + fi
> +
> + if test "$DIST" != "skip"
> + then
> + $MAKE dist
> + $MAKE maintainer-check-extra-dist
> + fi
> +
> + if test "$DISTCHECK" = "force"
> + then
> + $MAKE distcheck
> + fi
> +}
> +
> +main "$@"
Didn't see any bashisms, so keeping this /bin/sh seems fine.
I tried. I will split the long lines, that's a good point.
> +++ b/ci/containers/centos-8.Dockerfile
> @@ -0,0 +1,61 @@
> +# THIS FILE WAS AUTO-GENERATED
> +#
Do we really want to check in auto-generated files into git?
The Dockerfiles need to be present in the repository so that the CI can
use it to run the build and tests. It also makes it possible for anyone
to reproduce or check the builds locally without the need for anything
else. The generator is basically just a helper to update this file.
This is the same way that all the other projects using libvirt-ci work.
> +# $ lcitool dockerfile centos-8 libnbd
> +#
> +#
https://gitlab.com/libvirt/libvirt-ci/-/commit/684ac15bdf4de9c5b07614f9bb...
You do have a point, however, that libvirt-ci (and in particular, a VERY
recent non-released commit) is not standard on other machines, so
checking them in makes life easier.
Once the libvirt-CI patches are in I will submit the libvirt-ci patches
upstream. I first want to make sure they are correct.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
6:24 a.m.
New subject: [libnbd PATCH 5/5] Introduction of automated testing
Eric had a few comments, I'm happy to go with this after the fairly
minor changes he suggested.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/
6:16 a.m.
On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
This is reworked version of
https://listman.redhat.com/archives/libguestfs/2021-March/msg00134.html
with more packages installed so that more code paths are tested, also some fixes
in the code (mostly requirements).
There are still some things that fail.
FreeBSD
=======
The build fails because there is no fallocate() there.
I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
know what the build error was?
I'm seeing test failures though which I'll fix if they are easy. I
think for non-Linux right now I'm most concerned about build failures.
Many platforms (those that have nbd-server in repositories)
===========================================================
interop/interop-nbd-server fails with:
Error: inetd mode requires syslog
Exiting.
which makes sense as it is run with port 0, but how to check for
whether it is compiled with or without syslog (so that we know to
skip the test) or whether it is something else that is missing
(capabilities in a container) is beyond me.
I wasn't able to reproduce this (on FreeBSD). Do you know which
operating systems have nbd-server compiled without syslog?
interop/list-exports-nbd-server gets stuck and in the CI times out
the whole
test suite. Locally I need to manually exec into the container:
podman exec -itu bash
and I see the nbd-server is just not doing anything. After killing
it the test ends and fails. I did not debug nbd-server for this,
maybe it is again some requisite that is missing and we are not
checking for it (capability, nbd module access, etc.), I do not
know.
FreeBSD seems OK here. Do you know which OSes this affected?
There are also some skips that I did not go into any more after
trying to figure out every "... no" in config.log:
I wouldn't worry too much about these in terms of getting things
working. We can always extend the CI later.
Both interop-qemu-nbd-tls-certs and interop-qemu-nbd-tls-psk get
skipped because they are missing the keys, but I presume those are
supposed to be generated.
These require "certtool" (part of gnutls).
I think that all these can be figured out after the final patch is
merged so that the CI runs truly automatically. I am posting it for
review though as I am not sure the solutions in first four patches
are the preferred ones.
I agree.
Thanks!
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
7:34 a.m.
On Tue, May 11, 2021 at 12:16:19PM +0100, Richard W.M. Jones wrote:
On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
> FreeBSD
> =======
>
> The build fails because there is no fallocate() there.
I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
know what the build error was?
I'm seeing test failures though which I'll fix if they are easy. I
think for non-Linux right now I'm most concerned about build failures.
Another problem with the libnbd tests is that they use the installed
nbdkit, but -- presumably for political rather than technical reasons --
nbdkit on FreeBSD is built without GnuTLS support. While I could add
'requires' lines everywhere to test this, it may be better (on
FreeBSD) to either not test against nbdkit at all or to test against
the latest nbdkit build. Could CI tests allow this? Don't worry
about implementing this, I just want to know what's possible.
The situation for testing nbdkit is similar but reversed. FreeBSD
does not package libnbd at all so far, but I'm quite sure they'll also
build a TLS-less version if they get around to it.
Someone requested a version of libnbd that supported OpenSSL as an
alternative crypto backend recently. I wonder if they were a *BSD
developer?
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW
7:56 a.m.
On Tue, May 11, 2021 at 01:34:19PM +0100, Richard W.M. Jones wrote:
On Tue, May 11, 2021 at 12:16:19PM +0100, Richard W.M. Jones wrote:
> On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
> > FreeBSD
> > =======
> >
> > The build fails because there is no fallocate() there.
>
> I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
> know what the build error was?
>
> I'm seeing test failures though which I'll fix if they are easy. I
> think for non-Linux right now I'm most concerned about build failures.
Another problem with the libnbd tests is that they use the installed
nbdkit, but -- presumably for political rather than technical reasons --
nbdkit on FreeBSD is built without GnuTLS support. While I could add
'requires' lines everywhere to test this, it may be better (on
FreeBSD) to either not test against nbdkit at all or to test against
the latest nbdkit build. Could CI tests allow this? Don't worry
about implementing this, I just want to know what's possible.
The situation for testing nbdkit is similar but reversed. FreeBSD
does not package libnbd at all so far, but I'm quite sure they'll also
build a TLS-less version if they get around to it.
I wouldn't assume it is intentionale, as opposed to just a mistake.
They happily build other stuff with GNUTLS including both libvirt
and QEMU
Assuming this is current:
https://cgit.freebsd.org/ports/plain/net/nbdkit/Makefile
it seems to suggest they're attempting to build with gnutls.
Perhaps the configure script failed to detect gnutls despite being
present and silently disabled it in their builds ?
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 :|
8:13 a.m.
On Tue, May 11, 2021 at 01:56:14PM +0100, Daniel P. Berrangé wrote:
On Tue, May 11, 2021 at 01:34:19PM +0100, Richard W.M. Jones wrote:
> On Tue, May 11, 2021 at 12:16:19PM +0100, Richard W.M. Jones wrote:
> > On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
> > > FreeBSD
> > > =======
> > >
> > > The build fails because there is no fallocate() there.
> >
> > I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
> > know what the build error was?
> >
> > I'm seeing test failures though which I'll fix if they are easy. I
> > think for non-Linux right now I'm most concerned about build failures.
>
> Another problem with the libnbd tests is that they use the installed
> nbdkit, but -- presumably for political rather than technical reasons --
> nbdkit on FreeBSD is built without GnuTLS support. While I could add
> 'requires' lines everywhere to test this, it may be better (on
> FreeBSD) to either not test against nbdkit at all or to test against
> the latest nbdkit build. Could CI tests allow this? Don't worry
> about implementing this, I just want to know what's possible.
>
> The situation for testing nbdkit is similar but reversed. FreeBSD
> does not package libnbd at all so far, but I'm quite sure they'll also
> build a TLS-less version if they get around to it.
I wouldn't assume it is intentionale, as opposed to just a mistake.
They happily build other stuff with GNUTLS including both libvirt
and QEMU
Assuming this is current:
https://cgit.freebsd.org/ports/plain/net/nbdkit/Makefile
it seems to suggest they're attempting to build with gnutls.
Perhaps the configure script failed to detect gnutls despite being
present and silently disabled it in their builds ?
Oh this is ports versus packages again. Who thought haven't
two different packaging systems was a good idea?!
$ nbdkit --dump-config
bindir=/usr/local/bin
filterdir=/usr/local/lib/nbdkit/filters
libdir=/usr/local/lib
mandir=/usr/local/man
name=nbdkit
plugindir=/usr/local/lib/nbdkit/plugins
root_tls_certificates_dir=/usr/local/etc/pki/nbdkit
sbindir=/usr/local/sbin
selinux=no
sysconfdir=/usr/local/etc
tls=no <------
version=1.20.4
version_major=1
version_minor=20
But this is the pkg version, not the ports version.
Somehow the ports version of nbdkit is not available on my FreeBSD
box. I'm not sure if I'm doing something wrong or if it's because I'm
not using the latest nbdkit. However I did read the link above and I
agree it ought to be using gnutls.
The bigger problem is installing a port in a CI test is I suppose more
likely to go wrong (because it's actually building the prerequisite
from source).
Rich.
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 :|
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v
5:22 p.m.
On Tue, May 11, 2021 at 02:13:47PM +0100, Richard W.M. Jones wrote:
On Tue, May 11, 2021 at 01:56:14PM +0100, Daniel P. Berrangé wrote:
> On Tue, May 11, 2021 at 01:34:19PM +0100, Richard W.M. Jones wrote:
> > On Tue, May 11, 2021 at 12:16:19PM +0100, Richard W.M. Jones wrote:
> > > On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
> > > > FreeBSD
> > > > =======
> > > >
> > > > The build fails because there is no fallocate() there.
> > >
> > > I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
> > > know what the build error was?
> > >
> > > I'm seeing test failures though which I'll fix if they are easy.
I
> > > think for non-Linux right now I'm most concerned about build failures.
> >
> > Another problem with the libnbd tests is that they use the installed
> > nbdkit, but -- presumably for political rather than technical reasons --
> > nbdkit on FreeBSD is built without GnuTLS support. While I could add
> > 'requires' lines everywhere to test this, it may be better (on
> > FreeBSD) to either not test against nbdkit at all or to test against
> > the latest nbdkit build. Could CI tests allow this? Don't worry
> > about implementing this, I just want to know what's possible.
> >
> > The situation for testing nbdkit is similar but reversed. FreeBSD
> > does not package libnbd at all so far, but I'm quite sure they'll also
> > build a TLS-less version if they get around to it.
>
> I wouldn't assume it is intentionale, as opposed to just a mistake.
> They happily build other stuff with GNUTLS including both libvirt
> and QEMU
>
> Assuming this is current:
>
> https://cgit.freebsd.org/ports/plain/net/nbdkit/Makefile
>
> it seems to suggest they're attempting to build with gnutls.
>
> Perhaps the configure script failed to detect gnutls despite being
> present and silently disabled it in their builds ?
Oh this is ports versus packages again. Who thought haven't
two different packaging systems was a good idea?!
$ nbdkit --dump-config
bindir=/usr/local/bin
filterdir=/usr/local/lib/nbdkit/filters
libdir=/usr/local/lib
mandir=/usr/local/man
name=nbdkit
plugindir=/usr/local/lib/nbdkit/plugins
root_tls_certificates_dir=/usr/local/etc/pki/nbdkit
sbindir=/usr/local/sbin
selinux=no
sysconfdir=/usr/local/etc
tls=no <------
version=1.20.4
version_major=1
version_minor=20
But this is the pkg version, not the ports version.
OK, I must admit I am not used to *BSD packaging and I am glad I got the
CI running on FreeBSD at least.
Somehow the ports version of nbdkit is not available on my FreeBSD
box. I'm not sure if I'm doing something wrong or if it's because I'm
not using the latest nbdkit. However I did read the link above and I
agree it ought to be using gnutls.
The bigger problem is installing a port in a CI test is I suppose more
likely to go wrong (because it's actually building the prerequisite
from source).
Well, if it fails, that is. I guess we _could_ install from ports, at
least for some particular package.
@Andrea: Did you stumble upon anything related where you needed to deal
with or thought about using something from ports?
Martin
Rich.
> 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 :|
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v
4:17 p.m.
On Tue, May 11, 2021 at 01:34:19PM +0100, Richard W.M. Jones wrote:
On Tue, May 11, 2021 at 12:16:19PM +0100, Richard W.M. Jones wrote:
> On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
> > FreeBSD
> > =======
> >
> > The build fails because there is no fallocate() there.
>
> I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
> know what the build error was?
>
> I'm seeing test failures though which I'll fix if they are easy. I
> think for non-Linux right now I'm most concerned about build failures.
Another problem with the libnbd tests is that they use the installed
nbdkit, but -- presumably for political rather than technical reasons --
nbdkit on FreeBSD is built without GnuTLS support. While I could add
'requires' lines everywhere to test this, it may be better (on
FreeBSD) to either not test against nbdkit at all or to test against
the latest nbdkit build. Could CI tests allow this? Don't worry
about implementing this, I just want to know what's possible.
That is a future plan after basic functionality is working. I am still
debating whether running both builds make sense (with and without
building own nbdkit).
For nbdkit I will go with the same (running against self-built libnbd
and maybe without it as well).
The situation for testing nbdkit is similar but reversed. FreeBSD
does not package libnbd at all so far, but I'm quite sure they'll also
build a TLS-less version if they get around to it.
Someone requested a version of libnbd that supported OpenSSL as an
alternative crypto backend recently. I wonder if they were a *BSD
developer?
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW
3:21 p.m.
On Tue, May 11, 2021 at 12:16:19PM +0100, Richard W.M. Jones wrote:
On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
> This is reworked version of
>
> https://listman.redhat.com/archives/libguestfs/2021-March/msg00134.html
>
> with more packages installed so that more code paths are tested, also some fixes
> in the code (mostly requirements).
>
> There are still some things that fail.
>
> FreeBSD
> =======
>
> The build fails because there is no fallocate() there.
I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
know what the build error was?
The error is visible here:
https://gitlab.com/nertpinx/libnbd/-/jobs/1237433032#L2185
is it possible that I did not include some dependency in the system? Or
maybe it is compiling a file that is not compiled on your setup? I
could not find anything fallocate() related for FreeBSD, only
posix_fallocate().
I'm seeing test failures though which I'll fix if they are
easy. I
think for non-Linux right now I'm most concerned about build failures.
> Many platforms (those that have nbd-server in repositories)
> ===========================================================
>
> interop/interop-nbd-server fails with:
>
> Error: inetd mode requires syslog
> Exiting.
>
> which makes sense as it is run with port 0, but how to check for
> whether it is compiled with or without syslog (so that we know to
> skip the test) or whether it is something else that is missing
> (capabilities in a container) is beyond me.
I wasn't able to reproduce this (on FreeBSD). Do you know which
operating systems have nbd-server compiled without syslog?
This was some Linux distro and I do not know if it actually is "build
without syslog", it only looked like it based on the nbd-server code
that I went through. But it might be some missing capability or
anything else that is actually affected by the fact that the builds and
tests are running in containers.
I might have mixed this one and the below. You can try it on Ubuntu
18.04, but you would have to try it locally, you cannot see it in the CI
because it times out and it requires manual intervention. Basically see
below.
> interop/list-exports-nbd-server gets stuck and in the CI times
out the whole
> test suite. Locally I need to manually exec into the container:
>
> podman exec -itu bash
>
> and I see the nbd-server is just not doing anything. After killing
> it the test ends and fails. I did not debug nbd-server for this,
> maybe it is again some requisite that is missing and we are not
> checking for it (capability, nbd module access, etc.), I do not
> know.
FreeBSD seems OK here. Do you know which OSes this affected?
I think Ubuntu 18.04, see above.
> There are also some skips that I did not go into any more after
> trying to figure out every "... no" in config.log:
I wouldn't worry too much about these in terms of getting things
working. We can always extend the CI later.
> Both interop-qemu-nbd-tls-certs and interop-qemu-nbd-tls-psk get
> skipped because they are missing the keys, but I presume those are
> supposed to be generated.
These require "certtool" (part of gnutls).
I made sure I installed gnutls-bin (or whatever gnutls package provides
certtool), but I might've missed that certool is in another package on
some particular distro.
> I think that all these can be figured out after the final patch
is
> merged so that the CI runs truly automatically. I am posting it for
> review though as I am not sure the solutions in first four patches
> are the preferred ones.
I agree.
Thanks!
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
4:22 p.m.
On Wed, May 12, 2021 at 10:21:57PM +0200, Martin Kletzander wrote:
On Tue, May 11, 2021 at 12:16:19PM +0100, Richard W.M. Jones wrote:
>On Thu, May 06, 2021 at 01:30:05PM +0200, Martin Kletzander wrote:
>>This is reworked version of
>>
>> https://listman.redhat.com/archives/libguestfs/2021-March/msg00134.html
>>
>>with more packages installed so that more code paths are tested, also some fixes
>>in the code (mostly requirements).
>>
>>There are still some things that fail.
>>
>>FreeBSD
>>=======
>>
>>The build fails because there is no fallocate() there.
>
>I'm actually not seeing a failure (FreeBSD 12.2). Do you happen to
>know what the build error was?
>
The error is visible here:
https://gitlab.com/nertpinx/libnbd/-/jobs/1237433032#L2185
Oh I see, this is in fact a bug. (Kind of, it's actually just a
harmless warning that you only see with --enable-gcc-warnings, but
best to fix it anyway). I'll push a fix for this shortly.
The system works!
>>Both interop-qemu-nbd-tls-certs and interop-qemu-nbd-tls-psk
get
>>skipped because they are missing the keys, but I presume those are
>>supposed to be generated.
>
>These require "certtool" (part of gnutls).
>
I made sure I installed gnutls-bin (or whatever gnutls package provides
certtool), but I might've missed that certool is in another package on
some particular distro.
It should be in gnutls-bin in Debian/Ubuntu. We also need psktool
from the same package.
https://packages.debian.org/search?searchon=contents&keywords=certtoo...
./configure output should say:
checking for certtool... certtool
checking for psktool... psktool
tests/pki/* is created by this script:
https://gitlab.com/nbdkit/libnbd/-/blob/master/tests/make-pki.sh
while tests/keys.psk is created by running psktool from tests/Makefile.
Anyway it's not a big deal. We can revisit skipped tests later once
everything is up and running.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW
1171
days inactive
1177
days old
32 comments
5 participants
participants (5)
-
Daniel P. Berrangé -
Eric Blake -
Martin Kletzander -
Nir Soffer -
Richard W.M. Jones