thr3ads.net - Libguestfs - [Libguestfs] [libnbd PATCH v2 00/23] Many CI fixes [Jun 2021]

If this information is useful, please help other people find it:
Share via:

Martin Kletzander

2021-Jun-10 23:12 UTC

[Libguestfs] [libnbd PATCH v2 00/23] Many CI fixes

Lot of clean-ups for the CI.  I also added support for easily configurable way
of skipping particular tests on selected distros.  The only job in the pipeline
that is not green with these patches is the MacOS build and that will require
more work.

v2:
 - struct sockaddr_vm fix for MacOS
 - bash completion fixed - no need to skip dist on opensuse
 - fixed check for qemu-storage-daemon version
 - also run "brew upgrade" on MacOS
 - incorporated reviews

Martin Kletzander (23):
  Include sys/vsock.h if linux/vm_sockets.h is not available
  bash: Generate completion files during build
  fuse: Only support defined fallocate modes
  interop: Do not test against broken qemu-storage-daemon
  tests: Fix hexdump probing
  tests: Clean up qemu-nbd detection
  tests: Enhance fuse probing
  tests: Fix port randomisation
  tests: Require cap_sys_admin where root is required
  tests: Do not use magic parameter for some nbdkit plugins
  tests: Rename version to get-version
  ci: Change docker driver and archive logs
  ci: Remove cross-compilation targets
  ci: Remove debian-10-clang build
  ci: Add support for FreeBSD-13.0
  ci: Fix run commands in README
  ci: Some build script fixes
  ci: Add support for test skipping
  ci: Rename build_script.sh to just build.sh
  ci: Skip some broken tests/distro combinations
  ci: Only run `make check` on Linux
  ci: Also perform `brew upgrade` on MacOS
  ci: Update build files

 configure.ac                                  |   2 +-
 lib/connect.c                                 |   2 +
 tests/Makefile.am                             |  18 +-
 tests/functions.sh.in                         |  58 ++++
 tests/{version.c => get-version.c}            |   0
 interop/interop-qemu-storage-daemon.sh        |   6 +-
 .gitignore                                    |   2 +-
 .gitlab-ci.yml                                | 247 ++----------------
 bash/Makefile.am                              |  16 +-
 ci/README.rst                                 |  16 +-
 ci/build.sh                                   | 117 +++++++++
 ci/build_script.sh                            |  56 ----
 ci/cirrus/build.yml                           |   3 +-
 ci/cirrus/freebsd-12.vars                     |   5 +-
 ci/cirrus/freebsd-13.vars                     |  13 +
 ci/cirrus/freebsd-current.vars                |   5 +-
 ci/cirrus/macos-11.vars                       |   6 +-
 ci/containers/centos-8.Dockerfile             |  12 +-
 ci/containers/centos-stream-8.Dockerfile      |  12 +-
 .../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            |   9 +-
 .../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           |   9 +-
 ci/containers/fedora-33.Dockerfile            |  14 +-
 ci/containers/fedora-34.Dockerfile            |  14 +-
 .../fedora-rawhide-cross-mingw32.Dockerfile   |  71 -----
 .../fedora-rawhide-cross-mingw64.Dockerfile   |  71 -----
 ci/containers/fedora-rawhide.Dockerfile       |  14 +-
 ci/containers/opensuse-leap-152.Dockerfile    |  12 +-
 ci/containers/opensuse-tumbleweed.Dockerfile  |  12 +-
 ci/containers/refresh                         |  20 --
 ci/containers/ubuntu-1804.Dockerfile          |   8 +-
 ci/containers/ubuntu-2004.Dockerfile          |   9 +-
 ci/skipped_tests                              |  12 +
 copy/copy-block-to-nbd.sh                     |   3 +-
 copy/copy-file-to-qcow2.sh                    |  17 +-
 copy/copy-nbd-to-block.sh                     |   3 +-
 copy/copy-nbd-to-file.sh                      |   2 +-
 copy/copy-nbd-to-nbd.sh                       |   2 +-
 copy/copy-nbd-to-small-block-error.sh         |   5 +-
 copy/copy-tls.sh                              |   2 +-
 fuse/operations.c                             |   8 +
 fuse/test-errors.sh                           |   2 +-
 fuse/test-file-mode.sh                        |   3 +-
 fuse/test-nbdkit-command.sh                   |   2 +-
 fuse/test-nbdkit-file-null.sh                 |   2 +-
 fuse/test-nbdkit.sh                           |   3 +-
 fuse/test-parallel.sh                         |   2 +-
 fuse/test-pattern.sh                          |   4 +-
 fuse/test-qcow2.sh                            |   3 +-
 fuse/test-trim.sh                             |   2 +-
 fuse/test-unix.sh                             |   2 +-
 fuse/test-zero.sh                             |   2 +-
 info/Makefile.am                              |   1 +
 info/info-description-qemu.sh                 |  17 +-
 info/info-list-json-qemu.sh                   |  17 +-
 info/info-list-qemu.sh                        |  17 +-
 info/info-map-qemu-allocation-depth.sh        |  16 +-
 info/info-map-qemu-dirty-bitmap.sh            |  23 +-
 74 files changed, 400 insertions(+), 2093 deletions(-)
 rename tests/{version.c => get-version.c} (100%)
 create mode 100755 ci/build.sh
 delete mode 100755 ci/build_script.sh
 create mode 100644 ci/cirrus/freebsd-13.vars
 delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-aarch64.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-armv6l.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-armv7l.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-i686.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-mips64el.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-mipsel.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-ppc64le.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-s390x.Dockerfile
 delete mode 100644 ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
 delete mode 100644 ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
 create mode 100644 ci/skipped_tests

-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 01/23] Include sys/vsock.h if linux/vm_sockets.h is not available

This is the case on MacOS for example.  The issue is that AF_VSOCK is defined in
sys/socket.h, but struct sockaddr_vm is not, so the safeguard lower in the file
does not work.  Thankfully sys/vsock.h has the sockaddr_vm definition, so
including that fixes the build issue.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 configure.ac  | 2 +-
 lib/connect.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0dce57a3f502..065ede6342b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ AC_CHECK_HEADERS([\
     stdatomic.h \
     sys/endian.h])
 
-AC_CHECK_HEADERS([linux/vm_sockets.h], [], [], [#include <sys/socket.h>])
+AC_CHECK_HEADERS([linux/vm_sockets.h sys/vsock.h], [], [], [#include
<sys/socket.h>])
 
 dnl posix_fadvise helps to optimise linear reads and writes (optional).
 AC_CHECK_FUNCS([posix_fadvise])
diff --git a/lib/connect.c b/lib/connect.c
index 99781cd20dae..500806303404 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -33,6 +33,8 @@
 
 #ifdef HAVE_LINUX_VM_SOCKETS_H
 #include <linux/vm_sockets.h>
+#elif HAVE_SYS_VSOCK_H
+#include <sys/vsock.h>
 #endif
 
 #include "internal.h"
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 02/23] bash: Generate completion files during build

At that point the dependencies are more relevant and we will also avoid shipping
symlinks.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 bash/Makefile.am | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/bash/Makefile.am b/bash/Makefile.am
index 4245eca485a2..7a222fc90bae 100644
--- a/bash/Makefile.am
+++ b/bash/Makefile.am
@@ -24,25 +24,19 @@ EXTRA_DIST = \
 
 if HAVE_BASH_COMPLETION
 
-dist_bashcomp_DATA = nbdfuse nbdsh
+bashcomp_DATA = nbdfuse nbdsh
 
 if HAVE_LIBXML2
-dist_bashcomp_DATA += nbdcopy nbdinfo
+bashcomp_DATA += nbdcopy nbdinfo
 endif HAVE_LIBXML2
 
-
 nbdcopy: nbdsh
-	rm -f $@
-	$(LN_S) $(srcdir)/nbdsh $@
+	$(LN_S) nbdsh $@
 
 nbdfuse: nbdsh
-	rm -f $@
-	$(LN_S) $(srcdir)/nbdsh $@
+	$(LN_S) nbdsh $@
 
 nbdinfo: nbdsh
-	rm -f $@
-	$(LN_S) $(srcdir)/nbdsh $@
-
-CLEANFILES += nbdcopy nbdfuse nbdinfo
+	$(LN_S) nbdsh $@
 
 endif
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 03/23] fuse: Only support defined fallocate modes

None of them is defined on FreeBSD, for example, so by setting them to 0 they
will be skipped as they are used as bit flags.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 fuse/operations.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fuse/operations.c b/fuse/operations.c
index de04ba7b6d72..7a2b8985ab30 100644
--- a/fuse/operations.c
+++ b/fuse/operations.c
@@ -428,6 +428,14 @@ nbdfuse_fsync (const char *path, int datasync, struct
fuse_file_info *fi)
   return 0;
 }
 
+#ifndef FALLOC_FL_PUNCH_HOLE
+# define FALLOC_FL_PUNCH_HOLE 0
+#endif
+
+#ifndef FALLOC_FL_ZERO_RANGE
+# define FALLOC_FL_ZERO_RANGE 0
+#endif
+
 /* Punch a hole or write zeros. */
 static int
 nbdfuse_fallocate (const char *path, int mode, off_t offset, off_t len,
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 04/23] interop: Do not test against broken qemu-storage-daemon

The version 6.0.0 has very often a bug that makes the test fail, but which
should be fixed in later versions.  Version 5.1.0 has an issue as well.  The
version check is not the nicest way to check for this, but is enough.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 interop/interop-qemu-storage-daemon.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/interop/interop-qemu-storage-daemon.sh
b/interop/interop-qemu-storage-daemon.sh
index 09d1898ef459..16aafab9e65a 100755
--- a/interop/interop-qemu-storage-daemon.sh
+++ b/interop/interop-qemu-storage-daemon.sh
@@ -23,7 +23,11 @@ set -e
 set -x
 
 requires test "x$QEMU_STORAGE_DAEMON" != "x"
-requires $QEMU_STORAGE_DAEMON --version
+requires sed --version
+qsd_version="$($QEMU_STORAGE_DAEMON --version | \
+               sed -n '1s/qemu-storage-daemon version
\([0-9.]*\).*/\1/p')"
+requires_not test "$qsd_version" = "6.0.0"
+requires_not test "$qsd_version" = "5.1.0"
 requires nbdsh --version
 requires qemu-img --version
 
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 05/23] tests: Fix hexdump probing

It does not support `--version` parameter (at least on some platforms).

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 copy/copy-nbd-to-file.sh | 2 +-
 copy/copy-nbd-to-nbd.sh  | 2 +-
 copy/copy-tls.sh         | 2 +-
 fuse/test-pattern.sh     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/copy/copy-nbd-to-file.sh b/copy/copy-nbd-to-file.sh
index a7d37303e05f..33f215adcdff 100755
--- a/copy/copy-nbd-to-file.sh
+++ b/copy/copy-nbd-to-file.sh
@@ -22,7 +22,7 @@ set -e
 set -x
 
 requires nbdkit --exit-with-parent --version
-requires hexdump --version
+requires hexdump -C /dev/null
 requires stat --version
 
 file=copy-nbd-to-file.file
diff --git a/copy/copy-nbd-to-nbd.sh b/copy/copy-nbd-to-nbd.sh
index 9afddadd621c..60c535256091 100755
--- a/copy/copy-nbd-to-nbd.sh
+++ b/copy/copy-nbd-to-nbd.sh
@@ -23,7 +23,7 @@ set -x
 
 requires nbdkit --exit-with-parent --version
 requires cmp /dev/null /dev/null
-requires hexdump --version
+requires hexdump -C /dev/null
 
 pidfile1=copy-nbd-to-nbd.pid1
 pidfile2=copy-nbd-to-nbd.pid2
diff --git a/copy/copy-tls.sh b/copy/copy-tls.sh
index 0352a05f168f..a9183b7854d7 100755
--- a/copy/copy-tls.sh
+++ b/copy/copy-tls.sh
@@ -29,7 +29,7 @@ requires test "x$PSKTOOL" != "x"
 requires nbdkit --exit-with-parent --version
 requires bash -c "nbdkit --dump-config | grep tls=yes"
 requires cmp /dev/null /dev/null
-requires hexdump --version
+requires hexdump -C /dev/null
 
 pskfile=copy-tls.psk
 pidfile1=copy-tls.pid1
diff --git a/fuse/test-pattern.sh b/fuse/test-pattern.sh
index 44ecaa204bf6..f32f9d093285 100755
--- a/fuse/test-pattern.sh
+++ b/fuse/test-pattern.sh
@@ -27,7 +27,7 @@ set -x
 requires fusermount3 --version
 requires dd --version
 requires dd iflag=count_bytes,skip_bytes </dev/null
-requires hexdump --version
+requires hexdump -C /dev/null
 requires nbdkit --version
 requires nbdkit pattern --version
 
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 06/23] tests: Clean up qemu-nbd detection

It was already different in copy/ and info/, so it is nicer to merge them
together.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 tests/functions.sh.in                  | 19 +++++++++++++++++++
 copy/copy-file-to-qcow2.sh             | 17 +++--------------
 info/Makefile.am                       |  1 +
 info/info-description-qemu.sh          | 17 +++--------------
 info/info-list-json-qemu.sh            | 17 +++--------------
 info/info-list-qemu.sh                 | 17 +++--------------
 info/info-map-qemu-allocation-depth.sh | 16 +++-------------
 info/info-map-qemu-dirty-bitmap.sh     | 23 +++--------------------
 8 files changed, 38 insertions(+), 89 deletions(-)

diff --git a/tests/functions.sh.in b/tests/functions.sh.in
index f42c6906d0f8..271d8b357685 100644
--- a/tests/functions.sh.in
+++ b/tests/functions.sh.in
@@ -158,3 +158,22 @@ pick_unused_port ()
     done
     echo picked unused port $port
 }
+
+# Wait for qemu-nbd to start up.
+wait_for_pidfile ()
+{
+    local binary=$1
+    local pid=$2
+
+    for i in {1..60}; do
+        if test -f $pid; then
+            break
+        fi
+        sleep 1
+    done
+
+    if ! test -f $pid; then
+        echo "$0: $binary did not start up"
+        exit 1
+    fi
+}
diff --git a/copy/copy-file-to-qcow2.sh b/copy/copy-file-to-qcow2.sh
index 0ce3f8b6147a..dfd870b76413 100755
--- a/copy/copy-file-to-qcow2.sh
+++ b/copy/copy-file-to-qcow2.sh
@@ -21,8 +21,7 @@
 set -e
 set -x
 
-requires $QEMU_NBD --version
-requires bash -c "$QEMU_NBD --help | grep pid-file"
+requires $QEMU_NBD --pid-file=test.pid --version
 requires qemu-img --version
 requires cmp --version
 requires dd --version
@@ -55,20 +54,10 @@ qemu-img create -f qcow2 $qcow2 $size
 
 # Run qemu-nbd as a separate process so that we can copy to and from
 # the single process in two separate operations.
-qemu-nbd -f qcow2 -t --socket=$sock --pid-file=$pidfile $qcow2 &
+$QEMU_NBD -f qcow2 -t --socket=$sock --pid-file=$pidfile $qcow2 &
 cleanup_fn kill $!
 
-# Wait for qemu-nbd to start up.
-for i in {1..60}; do
-    if test -f $pidfile; then
-        break
-    fi
-    sleep 1
-done
-if ! test -f $pidfile; then
-    echo "$0: qemu-nbd did not start up"
-    exit 1
-fi
+wait_for_pidfile qemu-nbd $pid
 
 $VG nbdcopy $file "nbd+unix:///?socket=$sock"
 $VG nbdcopy "nbd+unix:///?socket=$sock" $file2
diff --git a/info/Makefile.am b/info/Makefile.am
index c62d51b7b067..5c717c700b35 100644
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -54,6 +54,7 @@ TESTS_ENVIRONMENT = \
 	MALLOC_CHECK_=1 \
 	MALLOC_PERTURB_=$(shell bash -c 'echo $$(( 1 + (RANDOM & 255) ))')
\
 	EXPECTED_VERSION=$(VERSION) \
+	QEMU_NBD=$(QEMU_NBD) \
 	$(NULL)
 LOG_COMPILER = $(top_builddir)/run
 TESTS diff --git a/info/info-description-qemu.sh
b/info/info-description-qemu.sh
index af2bd96b1cf6..e86fbe0eda5d 100755
--- a/info/info-description-qemu.sh
+++ b/info/info-description-qemu.sh
@@ -21,8 +21,7 @@
 set -e
 set -x
 
-requires qemu-nbd --version
-requires bash -c 'qemu-nbd --help | grep pid-file'
+requires $QEMU_NBD --pid-file=test.pid --version
 requires truncate --version
 
 img=info-description-qemu.img
@@ -33,20 +32,10 @@ cleanup_fn rm -f $img $out $pid $sock
 rm -f $img $out $pid $sock
 
 truncate -s 1M $img
-qemu-nbd -f raw -t --socket=$sock --pid-file=$pid -x "hello" -D
"world" $img &
+$QEMU_NBD -f raw -t --socket=$sock --pid-file=$pid -x "hello" -D
"world" $img &
 cleanup_fn kill $!
 
-# Wait for qemu-nbd to start up.
-for i in {1..60}; do
-    if test -f $pid; then
-        break
-    fi
-    sleep 1
-done
-if ! test -f $pid; then
-    echo "$0: qemu-nbd did not start up"
-    exit 1
-fi
+wait_for_pidfile qemu-nbd $pid
 
 $VG nbdinfo "nbd+unix:///hello?socket=$sock" > $out
 cat $out
diff --git a/info/info-list-json-qemu.sh b/info/info-list-json-qemu.sh
index 9933c38a2c1d..06e8f4994ec2 100755
--- a/info/info-list-json-qemu.sh
+++ b/info/info-list-json-qemu.sh
@@ -21,8 +21,7 @@
 set -e
 set -x
 
-requires qemu-nbd --version
-requires bash -c 'qemu-nbd --help | grep pid-file'
+requires $QEMU_NBD --pid-file=test.pid --version
 requires truncate --version
 requires jq --version
 
@@ -34,20 +33,10 @@ cleanup_fn rm -f $img $out $pid $sock
 rm -f $img $out $pid $sock
 
 truncate -s 1M $img
-qemu-nbd -t --socket=$sock --pid-file=$pid -x "hello" -D
"world" $img &
+$QEMU_NBD -t --socket=$sock --pid-file=$pid -x "hello" -D
"world" $img &
 cleanup_fn kill $!
 
-# Wait for qemu-nbd to start up.
-for i in {1..60}; do
-    if test -f $pid; then
-        break
-    fi
-    sleep 1
-done
-if ! test -f $pid; then
-    echo "$0: qemu-nbd did not start up"
-    exit 1
-fi
+wait_for_pidfile qemu-nbd $pid
 
 # Test twice, once with an export name not on the list,...
 $VG nbdinfo "nbd+unix://?socket=$sock" --list --json > $out
diff --git a/info/info-list-qemu.sh b/info/info-list-qemu.sh
index a6dcd4248b5f..fb6f57bcccf3 100755
--- a/info/info-list-qemu.sh
+++ b/info/info-list-qemu.sh
@@ -21,8 +21,7 @@
 set -e
 set -x
 
-requires qemu-nbd --version
-requires bash -c 'qemu-nbd --help | grep pid-file'
+requires $QEMU_NBD --pid-file=test.pid --version
 requires truncate --version
 
 img=info-list-qemu.img
@@ -33,20 +32,10 @@ cleanup_fn rm -f $img $out $pid $sock
 rm -f $img $out $pid $sock
 
 truncate -s 1M $img
-qemu-nbd -t --socket=$sock --pid-file=$pid -x "hello" -D
"world" $img &
+$QEMU_NBD -t --socket=$sock --pid-file=$pid -x "hello" -D
"world" $img &
 cleanup_fn kill $!
 
-# Wait for qemu-nbd to start up.
-for i in {1..60}; do
-    if test -f $pid; then
-        break
-    fi
-    sleep 1
-done
-if ! test -f $pid; then
-    echo "$0: qemu-nbd did not start up"
-    exit 1
-fi
+wait_for_pidfile qemu-nbd $pid
 
 # Test twice, once with an export name not on the list,...
 $VG nbdinfo "nbd+unix://?socket=$sock" --list > $out
diff --git a/info/info-map-qemu-allocation-depth.sh
b/info/info-map-qemu-allocation-depth.sh
index 9aeffd116bbb..9d0ac9ad54af 100755
--- a/info/info-map-qemu-allocation-depth.sh
+++ b/info/info-map-qemu-allocation-depth.sh
@@ -26,7 +26,7 @@ set -x
 
 requires qemu-img --version
 requires qemu-io --version
-requires qemu-nbd -A --version
+requires $QEMU_NBD -A --pid-file=test.pid --version
 requires tr --version
 
 base=info-map-qemu-allocation-depth
@@ -59,20 +59,10 @@ pid=$base.pid
 cleanup_fn rm -f $sock $pid
 rm -f $sock $pid
 
-qemu-nbd -t --socket=$sock --pid-file=$pid -f qcow2 -A $f4 &
+$QEMU_NBD -t --socket=$sock --pid-file=$pid -f qcow2 -A $f4 &
 cleanup_fn kill $!
 
-# Wait for qemu-nbd to start up.
-for i in {1..60}; do
-    if test -f $pid; then
-        break
-    fi
-    sleep 1
-done
-if ! test -f $pid; then
-    echo "$0: qemu-nbd did not start up"
-    exit 1
-fi
+wait_for_pidfile qemu-nbd $pid
 
 $VG nbdinfo --map=qemu:allocation-depth "nbd+unix://?socket=$sock"
> $out
 cat $out
diff --git a/info/info-map-qemu-dirty-bitmap.sh
b/info/info-map-qemu-dirty-bitmap.sh
index 01b62c1305a2..d9a6a5f143fc 100755
--- a/info/info-map-qemu-dirty-bitmap.sh
+++ b/info/info-map-qemu-dirty-bitmap.sh
@@ -26,17 +26,10 @@ set -x
 
 requires qemu-img --version
 requires qemu-io --version
-requires qemu-nbd --version
-requires bash -c 'qemu-nbd --help | grep pid-file'
+requires $QEMU_NBD -B test --pid-file=test.pid --version
 requires_qemu
 requires tr --version
 
-# This test uses the qemu-nbd -B option.
-if ! qemu-nbd --help | grep -sq -- -B; then
-    echo "$0: skipping because qemu-nbd does not support the -B
option"
-    exit 77
-fi
-
 f=info-map-qemu-dirty-bitmap.qcow2
 out=info-map-qemu-dirty-bitmap.out
 cleanup_fn rm -f $f $out
@@ -60,20 +53,10 @@ pid=info-map-qemu-dirty-bitmap.pid
 cleanup_fn rm -f $sock $pid
 rm -f $sock $pid
 
-qemu-nbd -t --socket=$sock --pid-file=$pid -f qcow2 -B bitmap0 $f &
+$QEMU_NBD -t --socket=$sock --pid-file=$pid -f qcow2 -B bitmap0 $f &
 cleanup_fn kill $!
 
-# Wait for qemu-nbd to start up.
-for i in {1..60}; do
-    if test -f $pid; then
-        break
-    fi
-    sleep 1
-done
-if ! test -f $pid; then
-    echo "$0: qemu-nbd did not start up"
-    exit 1
-fi
+wait_for_pidfile qemu-nbd $pid
 
 $VG nbdinfo --map=qemu:dirty-bitmap:bitmap0
"nbd+unix://?socket=$sock" > $out
 cat $out
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 07/23] tests: Enhance fuse probing

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 tests/functions.sh.in         | 10 ++++++++++
 fuse/test-errors.sh           |  2 +-
 fuse/test-file-mode.sh        |  3 +--
 fuse/test-nbdkit-command.sh   |  2 +-
 fuse/test-nbdkit-file-null.sh |  2 +-
 fuse/test-nbdkit.sh           |  3 +--
 fuse/test-parallel.sh         |  2 +-
 fuse/test-pattern.sh          |  2 +-
 fuse/test-qcow2.sh            |  3 +--
 fuse/test-trim.sh             |  2 +-
 fuse/test-unix.sh             |  2 +-
 fuse/test-zero.sh             |  2 +-
 12 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/tests/functions.sh.in b/tests/functions.sh.in
index 271d8b357685..6f18f06238d5 100644
--- a/tests/functions.sh.in
+++ b/tests/functions.sh.in
@@ -118,6 +118,16 @@ requires_linux_kernel_version ()
     requires test "$(printf "$kver\n$min" | sort -V | head -n
1)" = "$min"
 }
 
+# requires_fuse
+#
+# Check for fusermount3 and accessibility of /dev/fuse.  That is not the best
+# way to check that it is going to work, but so far it is enough.
+requires_fuse ()
+{
+    requires test -r /dev/fuse
+    requires fusermount3 --version
+}
+
 # Tests that run under check-root should use this.
 requires_root ()
 {
diff --git a/fuse/test-errors.sh b/fuse/test-errors.sh
index 2a08eec50971..4827a4756fd5 100755
--- a/fuse/test-errors.sh
+++ b/fuse/test-errors.sh
@@ -23,7 +23,7 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires dd --version
 requires dd iflag=count_bytes,skip_bytes </dev/null
 requires nbdkit --version
diff --git a/fuse/test-file-mode.sh b/fuse/test-file-mode.sh
index 7c684805eeff..19ce030faf4f 100755
--- a/fuse/test-file-mode.sh
+++ b/fuse/test-file-mode.sh
@@ -23,11 +23,10 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires nbdkit --exit-with-parent --version
 requires cmp --version
 requires dd --version
-requires test -r /dev/fuse
 
 if ! test -r /dev/urandom; then
     echo "$0: test skipped: /dev/urandom not readable"
diff --git a/fuse/test-nbdkit-command.sh b/fuse/test-nbdkit-command.sh
index 3fdabb740837..a743d60b5989 100755
--- a/fuse/test-nbdkit-command.sh
+++ b/fuse/test-nbdkit-command.sh
@@ -23,7 +23,7 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires nbdkit --exit-with-parent --version
 requires cmp --version
 requires dd --version
diff --git a/fuse/test-nbdkit-file-null.sh b/fuse/test-nbdkit-file-null.sh
index f7b8ed29b0f6..6454b1e0c687 100755
--- a/fuse/test-nbdkit-file-null.sh
+++ b/fuse/test-nbdkit-file-null.sh
@@ -23,7 +23,7 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires nbdkit --exit-with-parent --version
 
 pidfile=test-nbdkit-file-null.pid
diff --git a/fuse/test-nbdkit.sh b/fuse/test-nbdkit.sh
index fd0c9ce72356..047835ae7ec9 100755
--- a/fuse/test-nbdkit.sh
+++ b/fuse/test-nbdkit.sh
@@ -23,11 +23,10 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires nbdkit --exit-with-parent --version
 requires cmp --version
 requires dd --version
-requires test -r /dev/fuse
 
 if ! test -r /dev/urandom; then
     echo "$0: test skipped: /dev/urandom not readable"
diff --git a/fuse/test-parallel.sh b/fuse/test-parallel.sh
index 076c9a2b8482..55bb7c8e8e7d 100755
--- a/fuse/test-parallel.sh
+++ b/fuse/test-parallel.sh
@@ -23,7 +23,7 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires dd --version
 requires nbdkit --version
 requires nbdkit memory --version
diff --git a/fuse/test-pattern.sh b/fuse/test-pattern.sh
index f32f9d093285..1ff06e3eb095 100755
--- a/fuse/test-pattern.sh
+++ b/fuse/test-pattern.sh
@@ -24,7 +24,7 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires dd --version
 requires dd iflag=count_bytes,skip_bytes </dev/null
 requires hexdump -C /dev/null
diff --git a/fuse/test-qcow2.sh b/fuse/test-qcow2.sh
index 0c5836ad24f1..0545d1d8a933 100755
--- a/fuse/test-qcow2.sh
+++ b/fuse/test-qcow2.sh
@@ -24,12 +24,11 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires qemu-nbd --version
 requires qemu-img --version
 requires cmp --version
 requires dd --version
-requires test -r /dev/fuse
 
 if ! test -r /dev/urandom; then
     echo "$0: test skipped: /dev/urandom not readable"
diff --git a/fuse/test-trim.sh b/fuse/test-trim.sh
index 824dad79d16f..c845ba900881 100755
--- a/fuse/test-trim.sh
+++ b/fuse/test-trim.sh
@@ -23,7 +23,7 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires fallocate --version
 requires dd --version
 requires nbdkit --version
diff --git a/fuse/test-unix.sh b/fuse/test-unix.sh
index 20179bd17694..0a962f1da1f1 100755
--- a/fuse/test-unix.sh
+++ b/fuse/test-unix.sh
@@ -23,7 +23,7 @@
 set -e
 set -x
 
-requires fusermount3 --version
+requires_fuse
 requires nbdkit --exit-with-parent --version
 
 # Difficult to arrange for this test to be run this test under
diff --git a/fuse/test-zero.sh b/fuse/test-zero.sh
index e5de270d9a8c..bf9d1320a930 100755
--- a/fuse/test-zero.sh
+++ b/fuse/test-zero.sh
@@ -28,7 +28,7 @@ set -x
 #
https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git/log/?h=for-next
 requires_linux_kernel_version 5.14
 
-requires fusermount3 --version
+requires_fuse
 requires fallocate --version
 requires dd --version
 requires nbdkit --version
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 08/23] tests: Fix port randomisation

The shell/environment variable `$RANDOM` is not defined POSIX, so let bash
evaluate the whole expression by changing double quotes to single quotes.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 tests/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6a3a1f092572..c65bf8be399e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -608,7 +608,7 @@ TESTS += \
 	connect-uri-nbd-unix \
 	$(NULL)
 
-RANDOM1 := $(shell bash -c "echo $$(( 32768 + (RANDOM & 16383)
))")
+RANDOM1 := $(shell bash -c 'echo $$(( 32768 + (RANDOM & 16383) ))')
 connect_uri_nbd_SOURCES = connect-uri.c
 connect_uri_nbd_CPPFLAGS = \
 	-I$(top_srcdir)/include \
@@ -640,7 +640,7 @@ TESTS += \
 	connect-uri-nbds-unix \
 	$(NULL)
 
-RANDOM2 := $(shell bash -c "echo $$(( 32768 + (RANDOM & 16383)
))")
+RANDOM2 := $(shell bash -c 'echo $$(( 32768 + (RANDOM & 16383) ))')
 connect_uri_nbds_SOURCES = connect-uri.c
 connect_uri_nbds_CPPFLAGS = \
 	-I$(top_srcdir)/include \
@@ -671,7 +671,7 @@ TESTS += \
 	connect-uri-nbds-psk \
 	$(NULL)
 
-RANDOM3 := $(shell bash -c "echo $$(( 32768 + (RANDOM & 16383)
))")
+RANDOM3 := $(shell bash -c 'echo $$(( 32768 + (RANDOM & 16383) ))')
 connect_uri_nbds_psk_SOURCES = connect-uri.c
 connect_uri_nbds_psk_CPPFLAGS = \
 	-I$(top_srcdir)/include \
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 09/23] tests: Require cap_sys_admin where root is required

Some tests check for root privileges, but do not check if they have the
appropriate capabilities for all the tasks they are going to perform.  Not being
sure which ones are the proper ones all these currently check for cap_sys_admin,
although the code is made so that it can check for any capability that is
requested.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 tests/functions.sh.in                 | 29 +++++++++++++++++++++++++++
 copy/copy-block-to-nbd.sh             |  1 +
 copy/copy-nbd-to-block.sh             |  1 +
 copy/copy-nbd-to-small-block-error.sh |  1 +
 4 files changed, 32 insertions(+)

diff --git a/tests/functions.sh.in b/tests/functions.sh.in
index 6f18f06238d5..3472f49b84e3 100644
--- a/tests/functions.sh.in
+++ b/tests/functions.sh.in
@@ -128,6 +128,35 @@ requires_fuse ()
     requires fusermount3 --version
 }
 
+# requires_caps
+#
+# Check for linux capabilities.  Parameters are in the form of
"cap_name", e.g.
+#   requires_caps cap_net_admin cap_chown
+#
+# This should be coupled with requires_root as it will not fail when capsh
+# utility from libcapng is not installed or the capabilities are not found in
+# /proc/<pid>/status (to future-proof this against non-Linux platforms).
+requires_caps ()
+{
+    test -r /proc/$$/status || return 0
+    type capsh 2>/dev/null >&2 || return 0
+
+    local cap_eff
+    local cap_str
+
+    cap_eff="$(sed -n 's/CapEff:\s*\([^0-9a-fA-F]*\)/\1/p'
/proc/$$/status)"
+    test -z "$cap_eff" && return 0
+
+    cap_str=$(capsh --decode="$cap_eff")
+    while test "$#" -gt 0; do
+        if [[ ! "$cap_str" =~ [,=]$1(,|$) ]]; then
+            echo "$0: test skipped because of missing capability: $1"
+            exit 77
+        fi
+        shift
+    done
+}
+
 # Tests that run under check-root should use this.
 requires_root ()
 {
diff --git a/copy/copy-block-to-nbd.sh b/copy/copy-block-to-nbd.sh
index f29af6eb16b0..00d45427e967 100755
--- a/copy/copy-block-to-nbd.sh
+++ b/copy/copy-block-to-nbd.sh
@@ -22,6 +22,7 @@ set -e
 set -x
 
 requires_root
+requires_caps cap_sys_admin
 requires nbdkit --exit-with-parent --version
 requires test -r /sys/module/nbd
 requires nbd-client --version
diff --git a/copy/copy-nbd-to-block.sh b/copy/copy-nbd-to-block.sh
index 4924af991586..b3e6402c38a6 100755
--- a/copy/copy-nbd-to-block.sh
+++ b/copy/copy-nbd-to-block.sh
@@ -22,6 +22,7 @@ set -e
 set -x
 
 requires_root
+requires_caps cap_sys_admin
 requires nbdkit --exit-with-parent --version
 requires test -r /sys/module/nbd
 requires nbd-client --version
diff --git a/copy/copy-nbd-to-small-block-error.sh
b/copy/copy-nbd-to-small-block-error.sh
index 5a3953a3b0ad..ef5da9a0df62 100755
--- a/copy/copy-nbd-to-small-block-error.sh
+++ b/copy/copy-nbd-to-small-block-error.sh
@@ -22,6 +22,7 @@ set -e
 set -x
 
 requires_root
+requires_caps cap_sys_admin
 requires nbdkit --exit-with-parent --version
 requires test -r /sys/module/nbd
 requires nbd-client --version
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 10/23] tests: Do not use magic parameter for some nbdkit plugins

The 'memory' and 'pattern' plugins gained support for that some
time ago,
however on some systems such nbdkit is not in the official repositories.  This
makes sure that the tests don't fail unnecessarily on such systems.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 copy/copy-block-to-nbd.sh             | 2 +-
 copy/copy-nbd-to-block.sh             | 2 +-
 copy/copy-nbd-to-small-block-error.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/copy/copy-block-to-nbd.sh b/copy/copy-block-to-nbd.sh
index 00d45427e967..6894e17dd79e 100755
--- a/copy/copy-block-to-nbd.sh
+++ b/copy/copy-block-to-nbd.sh
@@ -35,7 +35,7 @@ cleanup_fn rm -f $pidfile $sock
 cleanup_fn nbd-client -d /dev/nbd0
 
 # Run an nbdkit server to act as the backing for /dev/nbd0.
-nbdkit --exit-with-parent -f -v -P $pidfile -U $sock pattern 5M &
+nbdkit --exit-with-parent -f -v -P $pidfile -U $sock pattern size=5M &
 # Wait for the pidfile to appear.
 for i in {1..60}; do
     if test -f $pidfile; then
diff --git a/copy/copy-nbd-to-block.sh b/copy/copy-nbd-to-block.sh
index b3e6402c38a6..9961c3f7bd6b 100755
--- a/copy/copy-nbd-to-block.sh
+++ b/copy/copy-nbd-to-block.sh
@@ -50,7 +50,7 @@ fi
 
 nbd-client -unix $sock /dev/nbd0 -b 512
 
-$VG nbdcopy -- [ nbdkit --exit-with-parent -v pattern 5M ] /dev/nbd0
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v pattern size=5M ] /dev/nbd0
 
 # Check that /dev/nbd0 is still a block device and we didn't
 # accidentally overwrite it with a regular file.
diff --git a/copy/copy-nbd-to-small-block-error.sh
b/copy/copy-nbd-to-small-block-error.sh
index ef5da9a0df62..75032e5b0d49 100755
--- a/copy/copy-nbd-to-small-block-error.sh
+++ b/copy/copy-nbd-to-small-block-error.sh
@@ -36,8 +36,8 @@ sock2=$(mktemp -u /tmp/libnbd-test-copy.XXXXXX)
 cleanup_fn rm -f $pidfile1 $pidfile2 $sock1 $sock2
 cleanup_fn nbd-client -d /dev/nbd0
 
-nbdkit --exit-with-parent -f -v -P $pidfile1 -U $sock1 pattern 10M &
-nbdkit --exit-with-parent -f -v -P $pidfile2 -U $sock2 memory 5M &
+nbdkit --exit-with-parent -f -v -P $pidfile1 -U $sock1 pattern size=10M &
+nbdkit --exit-with-parent -f -v -P $pidfile2 -U $sock2 memory size=5M &
 # Wait for the pidfiles to appear.
 for i in {1..60}; do
     if test -f $pidfile1 && test -f $pidfile2; then
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 11/23] tests: Rename version to get-version

FreeBSD has (and possibly other platforms as well) a header file named
"version"
in the system C++ headers, particularly `/usr/include/c++/v1/version`, which is
supposed to get picked up during the compilation of compile-cxx test as it gets
included by other system files.  However, because there is also a
"version" file
in the tests/ directory (one of the tests to check nbd_get_version() function)
it prefers that one for some reason.  And the C preprocessor gets thoroughly
confused, mainly by comments in the libtool script that is ./version, so this
commit changes the `version` binary name to `get-version` to avoid the issue.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 tests/Makefile.am                  | 12 ++++++------
 tests/{version.c => get-version.c} |  0
 .gitignore                         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/{version.c => get-version.c} (100%)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c65bf8be399e..09de0798ff30 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -68,7 +68,7 @@ check_PROGRAMS += \
 	close-null \
 	debug \
 	debug-environment \
-	version \
+	get-version \
 	export-name \
 	private-data \
 	$(NULL)
@@ -80,7 +80,7 @@ TESTS += \
 	close-null \
 	debug \
 	debug-environment \
-	version \
+	get-version \
 	export-name \
 	private-data \
 	$(NULL)
@@ -120,10 +120,10 @@ debug_environment_CPPFLAGS = -I$(top_srcdir)/include
 debug_environment_CFLAGS = $(WARNINGS_CFLAGS)
 debug_environment_LDADD = $(top_builddir)/lib/libnbd.la
 
-version_SOURCES = version.c
-version_CPPFLAGS = -I$(top_srcdir)/include
-version_CFLAGS = $(WARNINGS_CFLAGS)
-version_LDADD = $(top_builddir)/lib/libnbd.la
+get_version_SOURCES = get-version.c
+get_version_CPPFLAGS = -I$(top_srcdir)/include
+get_version_CFLAGS = $(WARNINGS_CFLAGS)
+get_version_LDADD = $(top_builddir)/lib/libnbd.la
 
 export_name_SOURCES = export-name.c
 export_name_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/tests/version.c b/tests/get-version.c
similarity index 100%
rename from tests/version.c
rename to tests/get-version.c
diff --git a/.gitignore b/.gitignore
index e942c5a17823..865b6896ac12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -183,6 +183,7 @@ Makefile.in
 /tests/export-name
 /tests/functions.sh
 /tests/get-size
+/tests/get-version
 /tests/is-not-rotational-flag
 /tests/is-rotational-flag
 /tests/keys.psk
@@ -201,5 +202,4 @@ Makefile.in
 /tests/shutdown-flags
 /tests/synch-parallel
 /tests/synch-parallel-tls
-/tests/version
 /valgrind/suppressions
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 12/23] ci: Change docker driver and archive logs

Logs are by default kept for 1 week, and when we output them directly, we
sometimes exceed the limit for the job.  This also makes the output cleaner.

Docker driver overlayfs2 should be faster for docker dind builds.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 .gitlab-ci.yml     | 30 ++++++++++++++++--------------
 ci/build_script.sh |  7 +------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07d81ca779df..74807381b8ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 variables:
   GIT_DEPTH: 100
+  DOCKER_DRIVER: overlay2
 
 stages:
   - containers
@@ -32,9 +33,8 @@ stages:
   after_script:
     - docker logout
 
-.native_build_job:
+.base_build_job:
   stage: builds
-  image: $CI_REGISTRY_IMAGE/$NAME:latest
   cache:
     paths:
       - ccache/
@@ -43,6 +43,20 @@ stages:
     - *script_variables
   script:
     - ci/build_script.sh
+  artifacts:
+    paths:
+      - "config.log"
+      - "**/test-suite.log"
+    public: true
+    when: always
+
+.native_build_job:
+  extends: .base_build_job
+  image: $CI_REGISTRY_IMAGE/$NAME:latest
+
+.cross_build_job:
+  extends: .base_build_job
+  image: $CI_REGISTRY_IMAGE/$NAME-cross-$CROSS:latest
 
 # Jobs that we delegate to Cirrus CI because they require an operating
 # system other than Linux. These jobs will only run if the required
@@ -83,18 +97,6 @@ stages:
   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:
diff --git a/ci/build_script.sh b/ci/build_script.sh
index ae236640449f..8e2cb5b986ca 100755
--- a/ci/build_script.sh
+++ b/ci/build_script.sh
@@ -29,12 +29,7 @@ main() {
        return 0
     fi
 
-    if ! $MAKE check
-    then
-        find . -name test-suite.log -exec grep -l '^X\?FAIL:'
'{}' \+ | \
-            xargs cat
-        exit 1
-    fi
+    $MAKE check
 
     if test "$CHECK_VALGRIND" = "force"
     then
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 13/23] ci: Remove cross-compilation targets

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 .gitlab-ci.yml                                | 203 ------------------
 .../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 --------
 .../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 --------
 .../fedora-rawhide-cross-mingw32.Dockerfile   |  71 ------
 .../fedora-rawhide-cross-mingw64.Dockerfile   |  71 ------
 ci/containers/refresh                         |  20 --
 21 files changed, 1827 deletions(-)
 delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-aarch64.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-armv6l.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-armv7l.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-i686.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-mips64el.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-mipsel.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-ppc64le.Dockerfile
 delete mode 100644 ci/containers/debian-sid-cross-s390x.Dockerfile
 delete mode 100644 ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
 delete mode 100644 ci/containers/fedora-rawhide-cross-mingw64.Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74807381b8ee..cd2167c52ab8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,10 +54,6 @@ stages:
   extends: .base_build_job
   image: $CI_REGISTRY_IMAGE/$NAME:latest
 
-.cross_build_job:
-  extends: .base_build_job
-  image: $CI_REGISTRY_IMAGE/$NAME-cross-$CROSS:latest
-
 # 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).
@@ -154,112 +150,6 @@ x64-ubuntu-2004-container:
   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:
@@ -386,96 +276,3 @@ x64-macos-11-build:
     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/containers/debian-10-cross-aarch64.Dockerfile
b/ci/containers/debian-10-cross-aarch64.Dockerfile
deleted file mode 100644
index 5c19904dc45f..000000000000
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross aarch64 debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index cfba6456170f..000000000000
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross armv6l debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 693ca11a0d5e..000000000000
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross armv7l debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 5e3688f51766..000000000000
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross i686 debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index a5c3a91ab97d..000000000000
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross mips debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 3fc65ad6c47f..000000000000
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross mips64el debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index f9a0aff68896..000000000000
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross mipsel debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 5cb602985c2a..000000000000
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross ppc64le debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 8280822e5e62..000000000000
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross s390x debian-10 libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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-sid-cross-aarch64.Dockerfile
b/ci/containers/debian-sid-cross-aarch64.Dockerfile
deleted file mode 100644
index c158d3d03ab5..000000000000
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross aarch64 debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index a68338db9c91..000000000000
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross armv6l debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 1f9085bd7e1e..000000000000
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross armv7l debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 37b28a612adf..000000000000
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross i686 debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index dee0fd013d2f..000000000000
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross mips64el debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 67feb7dede2c..000000000000
--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross mipsel debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 9914e4c2cfeb..000000000000
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross ppc64le debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 84d82fd3ecc9..000000000000
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross s390x debian-sid libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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/fedora-rawhide-cross-mingw32.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
deleted file mode 100644
index 08af4c68b0f9..000000000000
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ /dev/null
@@ -1,71 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross mingw32 fedora-rawhide libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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
deleted file mode 100644
index 67e5305ce1c5..000000000000
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ /dev/null
@@ -1,71 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile --cross mingw64 fedora-rawhide libnbd
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-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/refresh b/ci/containers/refresh
index 327f642ed2ec..7ce5332b940a 100755
--- a/ci/containers/refresh
+++ b/ci/containers/refresh
@@ -18,25 +18,5 @@ 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
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 14/23] ci: Remove debian-10-clang build

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 .gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd2167c52ab8..ad73daa9c01f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -159,14 +159,6 @@ x64-debian-10:
   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:
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 15/23] ci: Add support for FreeBSD-13.0

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 .gitlab-ci.yml            | 10 ++++++++++
 ci/cirrus/freebsd-13.vars | 13 +++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 ci/cirrus/freebsd-13.vars

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad73daa9c01f..4dd3d55791ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -256,6 +256,16 @@ x64-freebsd-12-build:
     UPDATE_COMMAND: pkg update
     INSTALL_COMMAND: pkg install -y
 
+x64-freebsd-13-build:
+  extends: .cirrus_build_job
+  variables:
+    NAME: freebsd-13
+    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+    CIRRUS_VM_IMAGE_SELECTOR: image_family
+    CIRRUS_VM_IMAGE_NAME: freebsd-13-0
+    UPDATE_COMMAND: pkg update
+    INSTALL_COMMAND: pkg install -y
+
 x64-macos-11-build:
   extends: .cirrus_build_job
   allow_failure: true
diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
new file mode 100644
index 000000000000..7df442bad110
--- /dev/null
+++ b/ci/cirrus/freebsd-13.vars
@@ -0,0 +1,13 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool variables freebsd-13 libnbd
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee667986e58316a45830
+
+PACKAGING_COMMAND='pkg'
+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 diffutils
fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server
nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py37-flake8 python3
qemu'
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 16/23] ci: Fix run commands in README

Mention how to run the script and keep the same UID, podman and docker use a
little bit different arguments for that.  While on it also fix the -v parameter
for docker which, on some machines, only accepts absolute paths.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 ci/README.rst | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ci/README.rst b/ci/README.rst
index 752d8fe46410..9f9a91ed2771 100644
--- a/ci/README.rst
+++ b/ci/README.rst
@@ -57,13 +57,21 @@ this case from the root of the repository:
 
 .. code-block:: shell
 
-    podman run -it --rm -v .:/repo:z -w /repo libnbd-fedora-rawhide bash
+    podman run -it --rm --userns=keep-id -v .:/repo:z -w /repo
libnbd-fedora-rawhide bash
+
+or
+
+.. code-block:: shell
+
+    docker run -it --rm --user $UID:$UID -v $PWD:/repo:z -w /repo
libnbd-fedora-rawhide bash
 
 which will bind-mount the current directory (root of the repository in our
case)
 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. This example
 illustrates running bash, which can be used to debug any issues in the build,
-but any command can be specified, for example the build script directly.
+but any command can be specified, for example the build script directly.  It
+also runs the command under a user with the same UID as the user running the
+command (even with the same UID).
 
 Since the directory is bind-mounted any changes will be visible in your local
 repository and vice versa. That is useful when you want to, for example, make a
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 17/23] ci: Some build script fixes

Provide a default for `$MAKE` so that the script is more easily usable outside
of CI and propagate `$CONFIGURE_OPTS` from lcitool to the configure script.
Lastly describe why cross compilation checking is skipped.  Even though cross
compilation is completely disabled in CI, the more generic of a script we have
the easier the adaptation to other projects could be.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 ci/build_script.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/build_script.sh b/ci/build_script.sh
index 8e2cb5b986ca..1439df365cec 100755
--- a/ci/build_script.sh
+++ b/ci/build_script.sh
@@ -3,6 +3,8 @@
 set -e
 
 main() {
+    MAKE="${MAKE-make -j $(getconf _NPROCESSORS_ONLN)}"
+
     autoreconf -if
 
     CONFIG_ARGS="\
@@ -20,13 +22,14 @@ main() {
        CONFIG_ARGS="$CONFIG_ARGS --enable-golang"
     fi
 
-    ./configure $CONFIG_ARGS
+    ./configure $CONFIGURE_OPTS $CONFIG_ARGS
 
     $MAKE
 
     if test -n "$CROSS"
     then
-       return 0
+        echo "Possibly run tests with an emulator in the future"
+        return 0
     fi
 
     $MAKE check
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 18/23] ci: Add support for test skipping

Some tests cannot be ran successfully and/or cannot properly probe for all their
dependency configurations.  This allows for skipping of individual test cases
based on the OS and its version.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 ci/build_script.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/ci/build_script.sh b/ci/build_script.sh
index 1439df365cec..ed3646ea969e 100755
--- a/ci/build_script.sh
+++ b/ci/build_script.sh
@@ -32,7 +32,64 @@ main() {
         return 0
     fi
 
-    $MAKE check
+    # Add a way to run all the tests, even the skipped ones, with an
environment
+    # variable, so that it can be set fora branch or fork in GitLab.
+    if test "$SKIPPED_TESTS" != "force"
+    then
+        # Skip tests from ci/skipped_tests if this is the right OS version
+        # The file
+        os_id="$(sh -c '. /etc/os-release; echo
"${NAME}-${VERSION_ID}"')"
+
+        echo OS ID: $os_id
+
+        # Skips comments and empty lines
+        grep '^[^#]' ci/skipped_tests | while read skipper
+        do
+            regex="${skipper%%;*}"
+            tests="${skipper#*;}"
+
+            echo SKIPPER: "$skipper"
+            echo REGEX: "$regex"
+            echo TESTS: "$tests"
+
+            # Ignore lines not meant for current $os_id
+            if ! echo "$os_id" | grep -q "$regex"; then
echo NOPE; continue; fi
+
+            echo SKIPPING $tests
+
+            for test_case in $tests
+            do
+                test_case_bckup="${test_case}_skipped_test"
+                if ! git ls-files "$test_case" | grep -q
"$test_case"
+                then
+                    make -C "$(dirname "$test_case")"
"$(basename "$test_case")" 2>/dev/null || :
+                fi
+                echo Backing up "$test_case" to
"${test_case_bckup}"
+                cp "$test_case" "${test_case_bckup}"
+
+                echo 'echo "Test skipped based on ci/skipped_tests
file"'> "$test_case"
+                echo 'exit 77'>> "$test_case"
+                chmod +x "$test_case"
+            done
+        done
+    fi
+
+    # We do not want the check to cause complete failure as we need to clean up
+    # the skipped test cases
+    failed=0
+    $MAKE check || failed=1
+
+    find . -name '*_skipped_test' -print | while read test_case_bckup
+    do
+        test_case="${test_case_bckup%_skipped_test}"
+
+        echo Moving "${test_case_bckup}" back to
"${test_case}"
+        rm -f "${test_case}"
+        mv -f "${test_case_bckup}" "${test_case}"
+    done
+
+    # Now it is safe to fail
+    test "$failed" -eq 0
 
     if test "$CHECK_VALGRIND" = "force"
     then
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 19/23] ci: Rename build_script.sh to just build.sh

The "script" is kind of implied and a bother to write all the time
when testing.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 .gitlab-ci.yml                   | 2 +-
 ci/README.rst                    | 4 ++--
 ci/{build_script.sh => build.sh} | 0
 ci/cirrus/build.yml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename ci/{build_script.sh => build.sh} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4dd3d55791ca..2993ca987c4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ stages:
   before_script:
     - *script_variables
   script:
-    - ci/build_script.sh
+    - ci/build.sh
   artifacts:
     paths:
       - "config.log"
diff --git a/ci/README.rst b/ci/README.rst
index 9f9a91ed2771..c1c97362e41f 100644
--- a/ci/README.rst
+++ b/ci/README.rst
@@ -4,8 +4,8 @@ Continuous Integration
 This document provides describes the continuous integration setup for this
 repository.
 
-The main script that is executed is ``ci/build_script.sh`` and should contain
-all necessary checks to be performed, although some of them might be run
+The main script that is executed is ``ci/build.sh`` and should contain all
+necessary checks to be performed, although some of them might be run
 conditionally.
 
 lcitool
diff --git a/ci/build_script.sh b/ci/build.sh
similarity index 100%
rename from ci/build_script.sh
rename to ci/build.sh
diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml
index 04f782a87a40..7e2a2be398eb 100644
--- a/ci/cirrus/build.yml
+++ b/ci/cirrus/build.yml
@@ -20,4 +20,4 @@ build_task:
     - git fetch origin "$CI_COMMIT_REF_NAME"
     - git reset --hard "$CI_COMMIT_SHA"
   build_script:
-    - ci/build_script.sh
+    - ci/build.sh
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 20/23] ci: Skip some broken tests/distro combinations

This cleans up most of the mess in GitLab CI.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 ci/skipped_tests | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 ci/skipped_tests

diff --git a/ci/skipped_tests b/ci/skipped_tests
new file mode 100644
index 000000000000..e2de9330baff
--- /dev/null
+++ b/ci/skipped_tests
@@ -0,0 +1,12 @@
+# Old nbd-server and built without syslog support, tests deadlock, old qemu-img
version
+^Ubuntu-18\.04$;interop/interop-nbd-server interop/list-exports-nbd-server
interop/structured-read.sh
+^openSUSE Leap-15;interop/interop-nbd-server interop/list-exports-nbd-server
+
+# Similar for Tumbleweed, except tests do not deadlock, only limit to version
2021* for now
+^openSUSE Tumbleweed-2021;interop/interop-nbd-server
interop/list-exports-nbd-server
+
+# Debian 10 has weird golang issues (old golang anyway) and old qemu-img
+^Debian GNU/Linux-10;golang/run-tests.sh interop/structured-read.sh
+
+# CentOS (stream) 8 probably has an older, buggy version of nbdkit and is not
updated
+^CentOS .*8$;info/info-uri.sh info/info-list-uris.sh
interop/list-exports-nbdkit
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 21/23] ci: Only run `make check` on Linux

This is a temporary test suspension, it does not completely work on other
systems as of now.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 ci/build.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ci/build.sh b/ci/build.sh
index ed3646ea969e..7d62a84a5d4b 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -32,6 +32,12 @@ main() {
         return 0
     fi
 
+    if test "$(uname)" != "Linux"
+    then
+        echo "Tests are temporarily skipped on non-Linux platforms"
+        return 0
+    fi
+
     # Add a way to run all the tests, even the skipped ones, with an
environment
     # variable, so that it can be set fora branch or fork in GitLab.
     if test "$SKIPPED_TESTS" != "force"
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 22/23] ci: Also perform `brew upgrade` on MacOS

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 .gitlab-ci.yml      | 2 ++
 ci/cirrus/build.yml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2993ca987c4d..99896d471475 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,6 +79,7 @@ stages:
           -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|[@]UPGRADE_COMMAND@|$UPGRADE_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"
@@ -275,6 +276,7 @@ x64-macos-11-build:
     CIRRUS_VM_IMAGE_SELECTOR: image
     CIRRUS_VM_IMAGE_NAME: big-sur-base
     UPDATE_COMMAND: brew update
+    UPGRADE_COMMAND: brew upgrade
     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
diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml
index 7e2a2be398eb..dd0b800a0718 100644
--- a/ci/cirrus/build.yml
+++ b/ci/cirrus/build.yml
@@ -13,6 +13,7 @@ env:
 build_task:
   install_script:
     - @UPDATE_COMMAND@
+    - @UPGRADE_COMMAND@
     - @INSTALL_COMMAND@ @PKGS@
     - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi
   clone_script:
-- 
2.32.0

Martin Kletzander

2021-Jun-10 23:12 UTC

head link

[Libguestfs] [libnbd PATCH v2 23/23] ci: Update build files

The upstream patch for libvirt-ci is still not completed yet, but there are some
improvements that need to be pulled in to clean up some of the builds.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 ci/cirrus/freebsd-12.vars                    |  5 ++---
 ci/cirrus/freebsd-13.vars                    |  2 +-
 ci/cirrus/freebsd-current.vars               |  5 ++---
 ci/cirrus/macos-11.vars                      |  6 +++---
 ci/containers/centos-8.Dockerfile            | 12 ++++++++----
 ci/containers/centos-stream-8.Dockerfile     | 12 ++++++++----
 ci/containers/debian-10.Dockerfile           |  9 ++++++---
 ci/containers/debian-sid.Dockerfile          |  9 ++++++---
 ci/containers/fedora-33.Dockerfile           | 14 +++++++++-----
 ci/containers/fedora-34.Dockerfile           | 14 +++++++++-----
 ci/containers/fedora-rawhide.Dockerfile      | 14 +++++++++-----
 ci/containers/opensuse-leap-152.Dockerfile   | 12 ++++++++----
 ci/containers/opensuse-tumbleweed.Dockerfile | 12 ++++++++----
 ci/containers/ubuntu-1804.Dockerfile         |  8 +++++---
 ci/containers/ubuntu-2004.Dockerfile         |  9 ++++++---
 15 files changed, 90 insertions(+), 53 deletions(-)

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 4e7f653a859c..cb5c83f06c0f 100644
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -2,13 +2,12 @@
 #
 #  $ lcitool variables freebsd-12 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621dcefefaf1b53f2
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 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'
+PKGS='autoconf automake bash-completion ca_root_nss ccache diffutils
fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server
nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py37-flake8 python3
qemu'
diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index 7df442bad110..41019e318f99 100644
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@@ -2,7 +2,7 @@
 #
 #  $ lcitool variables freebsd-13 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee667986e58316a45830
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 PACKAGING_COMMAND='pkg'
 CCACHE='/usr/local/bin/ccache'
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index dfdf58e8616b..fe2bf0b7d607 100644
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -2,13 +2,12 @@
 #
 #  $ lcitool variables freebsd-current libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621dcefefaf1b53f2
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 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'
+PKGS='autoconf automake bash-completion ca_root_nss ccache diffutils
fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server
nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py37-flake8 python3
qemu'
diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars
index 413a203782eb..a33ed5fa7254 100644
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@@ -2,13 +2,13 @@
 #
 #  $ lcitool variables macos-11 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621dcefefaf1b53f2
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 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'
+PKGS='autoconf automake bash-completion ccache cpanminus diffutils flake8
git glib gnu-sed gnutls golang jq libev libtool libxml2 make ocaml ocaml-findlib
perl pkg-config python3 qemu'
+CPAN_PKGS='Pod::Simple'
diff --git a/ci/containers/centos-8.Dockerfile
b/ci/containers/centos-8.Dockerfile
index e5bcd4ee7a9f..650713990edc 100644
--- a/ci/containers/centos-8.Dockerfile
+++ b/ci/containers/centos-8.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile centos-8 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM docker.io/library/centos:8
 
@@ -18,8 +18,8 @@ RUN dnf update -y && \
         ca-certificates \
         ccache \
         clang \
-        coreutils-single \
         diffutils \
+        fuse3 \
         fuse3-devel \
         gcc \
         gcc-c++ \
@@ -27,8 +27,8 @@ RUN dnf update -y && \
         glib2-devel \
         glibc-devel \
         glibc-langpack-en \
-        gnutls \
         gnutls-devel \
+        gnutls-utils \
         golang \
         iproute \
         jq \
@@ -39,13 +39,17 @@ RUN dnf update -y && \
         nbdkit \
         ocaml \
         ocaml-findlib \
+        ocamldoc \
         perl \
+        perl-Pod-Simple \
+        perl-podlators \
         pkgconfig \
         python3-devel \
         python3-flake8 \
         qemu-img \
         qemu-kvm \
-        sed && \
+        sed \
+        util-linux && \
     dnf autoremove -y && \
     dnf clean all -y && \
     rpm -qa | sort > /packages.txt && \
diff --git a/ci/containers/centos-stream-8.Dockerfile
b/ci/containers/centos-stream-8.Dockerfile
index e7c18bf3d23f..6bb5d19e90fe 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile centos-stream-8 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM quay.io/centos/centos:stream8
 
@@ -18,8 +18,8 @@ RUN dnf update -y && \
         ca-certificates \
         ccache \
         clang \
-        coreutils-single \
         diffutils \
+        fuse3 \
         fuse3-devel \
         gcc \
         gcc-c++ \
@@ -27,8 +27,8 @@ RUN dnf update -y && \
         glib2-devel \
         glibc-devel \
         glibc-langpack-en \
-        gnutls \
         gnutls-devel \
+        gnutls-utils \
         golang \
         iproute \
         jq \
@@ -39,13 +39,17 @@ RUN dnf update -y && \
         nbdkit \
         ocaml \
         ocaml-findlib \
+        ocamldoc \
         perl \
+        perl-Pod-Simple \
+        perl-podlators \
         pkgconfig \
         python3-devel \
         python3-flake8 \
         qemu-img \
         qemu-kvm \
-        sed && \
+        sed \
+        util-linux && \
     dnf autoremove -y && \
     dnf clean all -y && \
     rpm -qa | sort > /packages.txt && \
diff --git a/ci/containers/debian-10.Dockerfile
b/ci/containers/debian-10.Dockerfile
index 1d0d5eefa22d..0b140b15e0bb 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile debian-10 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM docker.io/library/debian:10-slim
 
@@ -14,12 +14,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             autoconf \
             automake \
             bash-completion \
+            bsdmainutils \
             ca-certificates \
             ccache \
             clang \
-            coreutils \
             diffutils \
             flake8 \
+            fuse3 \
             g++ \
             gcc \
             git \
@@ -41,10 +42,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             nbdkit \
             ocaml \
             ocaml-findlib \
+            ocaml-nox \
+            perl \
             perl-base \
             pkgconf \
             python3-dev \
-            qemu-kvm \
+            qemu \
             qemu-utils \
             sed && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid.Dockerfile
b/ci/containers/debian-sid.Dockerfile
index 9e42d34dc56f..29111f99d86a 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile debian-sid libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM docker.io/library/debian:sid-slim
 
@@ -14,12 +14,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             autoconf \
             automake \
             bash-completion \
+            bsdextrautils \
             ca-certificates \
             ccache \
             clang \
-            coreutils \
             diffutils \
             flake8 \
+            fuse3 \
             g++ \
             gcc \
             git \
@@ -41,10 +42,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             nbdkit \
             ocaml \
             ocaml-findlib \
+            ocaml-nox \
+            perl \
             perl-base \
             pkgconf \
             python3-dev \
-            qemu-kvm \
+            qemu \
             qemu-utils \
             sed && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/fedora-33.Dockerfile
b/ci/containers/fedora-33.Dockerfile
index a3b54c247a22..c6b434f268ea 100644
--- a/ci/containers/fedora-33.Dockerfile
+++ b/ci/containers/fedora-33.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile fedora-33 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM registry.fedoraproject.org/fedora:33
 
@@ -24,8 +24,8 @@ exec "$@"' > /usr/bin/nosync && \
         ca-certificates \
         ccache \
         clang \
-        coreutils \
         diffutils \
+        fuse3 \
         fuse3-devel \
         gcc \
         gcc-c++ \
@@ -33,8 +33,8 @@ exec "$@"' > /usr/bin/nosync && \
         glib2-devel \
         glibc-devel \
         glibc-langpack-en \
-        gnutls \
         gnutls-devel \
+        gnutls-utils \
         golang \
         iproute \
         jq \
@@ -46,13 +46,17 @@ exec "$@"' > /usr/bin/nosync && \
         nbdkit \
         ocaml \
         ocaml-findlib \
+        ocamldoc \
+        perl-Pod-Simple \
         perl-base \
+        perl-podlators \
         pkgconfig \
         python3-devel \
         python3-flake8 \
+        qemu \
         qemu-img \
-        qemu-kvm \
-        sed && \
+        sed \
+        util-linux && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y && \
     rpm -qa | sort > /packages.txt && \
diff --git a/ci/containers/fedora-34.Dockerfile
b/ci/containers/fedora-34.Dockerfile
index 85f68f107b66..f6cbbfef7c8e 100644
--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile fedora-34 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM registry.fedoraproject.org/fedora:34
 
@@ -24,8 +24,8 @@ exec "$@"' > /usr/bin/nosync && \
         ca-certificates \
         ccache \
         clang \
-        coreutils \
         diffutils \
+        fuse3 \
         fuse3-devel \
         gcc \
         gcc-c++ \
@@ -33,8 +33,8 @@ exec "$@"' > /usr/bin/nosync && \
         glib2-devel \
         glibc-devel \
         glibc-langpack-en \
-        gnutls \
         gnutls-devel \
+        gnutls-utils \
         golang \
         iproute \
         jq \
@@ -46,13 +46,17 @@ exec "$@"' > /usr/bin/nosync && \
         nbdkit \
         ocaml \
         ocaml-findlib \
+        ocamldoc \
+        perl-Pod-Simple \
         perl-base \
+        perl-podlators \
         pkgconfig \
         python3-devel \
         python3-flake8 \
+        qemu \
         qemu-img \
-        qemu-kvm \
-        sed && \
+        sed \
+        util-linux && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y && \
     rpm -qa | sort > /packages.txt && \
diff --git a/ci/containers/fedora-rawhide.Dockerfile
b/ci/containers/fedora-rawhide.Dockerfile
index e50b4837b6ea..20d40fb0838c 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile fedora-rawhide libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM registry.fedoraproject.org/fedora:rawhide
 
@@ -25,8 +25,8 @@ exec "$@"' > /usr/bin/nosync && \
         ca-certificates \
         ccache \
         clang \
-        coreutils \
         diffutils \
+        fuse3 \
         fuse3-devel \
         gcc \
         gcc-c++ \
@@ -34,8 +34,8 @@ exec "$@"' > /usr/bin/nosync && \
         glib2-devel \
         glibc-devel \
         glibc-langpack-en \
-        gnutls \
         gnutls-devel \
+        gnutls-utils \
         golang \
         iproute \
         jq \
@@ -47,13 +47,17 @@ exec "$@"' > /usr/bin/nosync && \
         nbdkit \
         ocaml \
         ocaml-findlib \
+        ocamldoc \
+        perl-Pod-Simple \
         perl-base \
+        perl-podlators \
         pkgconfig \
         python3-devel \
         python3-flake8 \
+        qemu \
         qemu-img \
-        qemu-kvm \
-        sed && \
+        sed \
+        util-linux && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y && \
     rpm -qa | sort > /packages.txt && \
diff --git a/ci/containers/opensuse-leap-152.Dockerfile
b/ci/containers/opensuse-leap-152.Dockerfile
index cfc664a686ca..7b4fed8b0872 100644
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile opensuse-leap-152 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM registry.opensuse.org/opensuse/leap:15.2
 
@@ -14,8 +14,8 @@ RUN zypper update -y && \
            ca-certificates \
            ccache \
            clang \
-           coreutils \
            diffutils \
+           fuse3 \
            fuse3-devel \
            gcc \
            gcc-c++ \
@@ -35,13 +35,17 @@ RUN zypper update -y && \
            nbd \
            ocaml \
            ocaml-findlib \
+           ocaml-ocamldoc \
+           perl \
+           perl-Pod-Simple \
            perl-base \
            pkgconfig \
            python3-devel \
            python3-flake8 \
-           qemu-kvm \
+           qemu \
            qemu-tools \
-           sed && \
+           sed \
+           util-linux && \
     zypper clean --all && \
     rpm -qa | sort > /packages.txt && \
     mkdir -p /usr/libexec/ccache-wrappers && \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile
b/ci/containers/opensuse-tumbleweed.Dockerfile
index 0a399aae7ea3..fa5b3f32edbc 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile opensuse-tumbleweed libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM registry.opensuse.org/opensuse/tumbleweed:latest
 
@@ -14,8 +14,8 @@ RUN zypper update -y && \
            ca-certificates \
            ccache \
            clang \
-           coreutils \
            diffutils \
+           fuse3 \
            fuse3-devel \
            gcc \
            gcc-c++ \
@@ -36,13 +36,17 @@ RUN zypper update -y && \
            nbdkit \
            ocaml \
            ocaml-findlib \
+           ocaml-ocamldoc \
+           perl \
+           perl-Pod-Simple \
            perl-base \
            pkgconfig \
            python3-devel \
            python3-flake8 \
-           qemu-kvm \
+           qemu \
            qemu-tools \
-           sed && \
+           sed \
+           util-linux && \
     zypper clean --all && \
     rpm -qa | sort > /packages.txt && \
     mkdir -p /usr/libexec/ccache-wrappers && \
diff --git a/ci/containers/ubuntu-1804.Dockerfile
b/ci/containers/ubuntu-1804.Dockerfile
index 2a4ad5a34715..8be863e8b951 100644
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile ubuntu-1804 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM docker.io/library/ubuntu:18.04
 
@@ -14,10 +14,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             autoconf \
             automake \
             bash-completion \
+            bsdmainutils \
             ca-certificates \
             ccache \
             clang \
-            coreutils \
             diffutils \
             flake8 \
             g++ \
@@ -39,10 +39,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             nbd-server \
             ocaml \
             ocaml-findlib \
+            ocaml-nox \
+            perl \
             perl-base \
             pkgconf \
             python3-dev \
-            qemu-kvm \
+            qemu \
             qemu-utils \
             sed && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/ubuntu-2004.Dockerfile
b/ci/containers/ubuntu-2004.Dockerfile
index ea1cf9bd7e8a..8f192ca1a603 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile ubuntu-2004 libnbd
 #
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/7f787787a85647c3045ebfa6634966b4b96d5d99
 
 FROM docker.io/library/ubuntu:20.04
 
@@ -14,12 +14,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             autoconf \
             automake \
             bash-completion \
+            bsdmainutils \
             ca-certificates \
             ccache \
             clang \
-            coreutils \
             diffutils \
             flake8 \
+            fuse3 \
             g++ \
             gcc \
             git \
@@ -41,10 +42,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             nbdkit \
             ocaml \
             ocaml-findlib \
+            ocaml-nox \
+            perl \
             perl-base \
             pkgconf \
             python3-dev \
-            qemu-kvm \
+            qemu \
             qemu-utils \
             sed && \
     eatmydata apt-get autoremove -y && \
-- 
2.32.0

Libguestfs - Jun 2021 - [libnbd PATCH v2 00/23] Many CI fixes

[Libguestfs] [libnbd PATCH v2 00/23] Many CI fixes

[Libguestfs] [libnbd PATCH v2 01/23] Include sys/vsock.h if linux/vm_sockets.h is not available

[Libguestfs] [libnbd PATCH v2 02/23] bash: Generate completion files during build

[Libguestfs] [libnbd PATCH v2 03/23] fuse: Only support defined fallocate modes

[Libguestfs] [libnbd PATCH v2 04/23] interop: Do not test against broken qemu-storage-daemon

[Libguestfs] [libnbd PATCH v2 05/23] tests: Fix hexdump probing

[Libguestfs] [libnbd PATCH v2 06/23] tests: Clean up qemu-nbd detection

[Libguestfs] [libnbd PATCH v2 07/23] tests: Enhance fuse probing

[Libguestfs] [libnbd PATCH v2 08/23] tests: Fix port randomisation

[Libguestfs] [libnbd PATCH v2 09/23] tests: Require cap_sys_admin where root is required

[Libguestfs] [libnbd PATCH v2 10/23] tests: Do not use magic parameter for some nbdkit plugins

[Libguestfs] [libnbd PATCH v2 11/23] tests: Rename version to get-version

[Libguestfs] [libnbd PATCH v2 12/23] ci: Change docker driver and archive logs

[Libguestfs] [libnbd PATCH v2 13/23] ci: Remove cross-compilation targets

[Libguestfs] [libnbd PATCH v2 14/23] ci: Remove debian-10-clang build

[Libguestfs] [libnbd PATCH v2 15/23] ci: Add support for FreeBSD-13.0

[Libguestfs] [libnbd PATCH v2 16/23] ci: Fix run commands in README

[Libguestfs] [libnbd PATCH v2 17/23] ci: Some build script fixes

[Libguestfs] [libnbd PATCH v2 18/23] ci: Add support for test skipping

[Libguestfs] [libnbd PATCH v2 19/23] ci: Rename build_script.sh to just build.sh

[Libguestfs] [libnbd PATCH v2 20/23] ci: Skip some broken tests/distro combinations

[Libguestfs] [libnbd PATCH v2 21/23] ci: Only run `make check` on Linux

[Libguestfs] [libnbd PATCH v2 22/23] ci: Also perform `brew upgrade` on MacOS

[Libguestfs] [libnbd PATCH v2 23/23] ci: Update build files