thr3ads.net - Libguestfs - [Libguestfs] [libnbd PATCH] ci: Update lcitool to request cargo during CI [Aug 2023]

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

Eric Blake

2023-Aug-15 21:33 UTC

[Libguestfs] [libnbd PATCH] ci: Update lcitool to request cargo during CI

Regenerate the CI build scripts with:

  ../libvirt-ci/bin/lcitool manifest ci/manifest.yml

using libvirt-ci bumped with a pending patch:
  https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/424

Signed-off-by: Eric Blake <eblake at redhat.com>
---

CI is still not green, but I've been working on it today.  I'm
currently waiting for a merge request to lcitool to land, if that
happens quickly, I can rework this commit message.  I'm also playing
with pushing this patch to a forked repo, to see how it fares, before
sending it to the main repo.

 ci/buildenv/almalinux-8.sh                    | 2 ++
 ci/buildenv/alpine-317.sh                     | 2 ++
 ci/buildenv/alpine-318.sh                     | 2 ++
 ci/buildenv/alpine-edge.sh                    | 2 ++
 ci/buildenv/centos-stream-8.sh                | 2 ++
 ci/buildenv/debian-11-cross-i686.sh           | 2 ++
 ci/buildenv/debian-11.sh                      | 2 ++
 ci/buildenv/debian-12-cross-i686.sh           | 2 ++
 ci/buildenv/debian-12.sh                      | 2 ++
 ci/buildenv/debian-sid.sh                     | 2 ++
 ci/buildenv/fedora-37.sh                      | 2 ++
 ci/buildenv/fedora-38.sh                      | 2 ++
 ci/buildenv/fedora-rawhide.sh                 | 2 ++
 ci/buildenv/opensuse-leap-15.sh               | 2 ++
 ci/buildenv/opensuse-tumbleweed.sh            | 2 ++
 ci/buildenv/ubuntu-2004.sh                    | 2 ++
 ci/buildenv/ubuntu-2204.sh                    | 2 ++
 ci/cirrus/freebsd-12.vars                     | 2 +-
 ci/cirrus/freebsd-13.vars                     | 2 +-
 ci/cirrus/freebsd-current.vars                | 2 +-
 ci/cirrus/macos-13.vars                       | 2 +-
 ci/containers/almalinux-8.Dockerfile          | 2 ++
 ci/containers/alpine-317.Dockerfile           | 2 ++
 ci/containers/alpine-318.Dockerfile           | 2 ++
 ci/containers/alpine-edge.Dockerfile          | 2 ++
 ci/containers/centos-stream-8.Dockerfile      | 2 ++
 ci/containers/debian-11-cross-i686.Dockerfile | 2 ++
 ci/containers/debian-11.Dockerfile            | 2 ++
 ci/containers/debian-12-cross-i686.Dockerfile | 2 ++
 ci/containers/debian-12.Dockerfile            | 2 ++
 ci/containers/debian-sid.Dockerfile           | 2 ++
 ci/containers/fedora-37.Dockerfile            | 2 ++
 ci/containers/fedora-38.Dockerfile            | 2 ++
 ci/containers/fedora-rawhide.Dockerfile       | 2 ++
 ci/containers/opensuse-leap-15.Dockerfile     | 2 ++
 ci/containers/opensuse-tumbleweed.Dockerfile  | 2 ++
 ci/containers/ubuntu-2004.Dockerfile          | 2 ++
 ci/containers/ubuntu-2204.Dockerfile          | 2 ++
 38 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/ci/buildenv/almalinux-8.sh b/ci/buildenv/almalinux-8.sh
index a7d31f03..2b4b9e3d 100644
--- a/ci/buildenv/almalinux-8.sh
+++ b/ci/buildenv/almalinux-8.sh
@@ -13,8 +13,10 @@ function install_buildenv() {
     dnf install -y \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/alpine-317.sh b/ci/buildenv/alpine-317.sh
index f7d8d50b..e9cd44ac 100644
--- a/ci/buildenv/alpine-317.sh
+++ b/ci/buildenv/alpine-317.sh
@@ -10,8 +10,10 @@ function install_buildenv() {
     apk add \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/alpine-318.sh b/ci/buildenv/alpine-318.sh
index f7d8d50b..e9cd44ac 100644
--- a/ci/buildenv/alpine-318.sh
+++ b/ci/buildenv/alpine-318.sh
@@ -10,8 +10,10 @@ function install_buildenv() {
     apk add \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/alpine-edge.sh b/ci/buildenv/alpine-edge.sh
index f7d8d50b..e9cd44ac 100644
--- a/ci/buildenv/alpine-edge.sh
+++ b/ci/buildenv/alpine-edge.sh
@@ -10,8 +10,10 @@ function install_buildenv() {
     apk add \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/centos-stream-8.sh b/ci/buildenv/centos-stream-8.sh
index 524e4a4f..ceb0a121 100644
--- a/ci/buildenv/centos-stream-8.sh
+++ b/ci/buildenv/centos-stream-8.sh
@@ -14,8 +14,10 @@ function install_buildenv() {
     dnf install -y \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/debian-11-cross-i686.sh
b/ci/buildenv/debian-11-cross-i686.sh
index fb90a64d..eb95d3a0 100644
--- a/ci/buildenv/debian-11-cross-i686.sh
+++ b/ci/buildenv/debian-11-cross-i686.sh
@@ -11,9 +11,11 @@ function install_buildenv() {
     apt-get install --no-install-recommends -y \
             autoconf \
             automake \
+            awk \
             bash-completion \
             bsdextrautils \
             ca-certificates \
+            cargo \
             ccache \
             diffutils \
             flake8 \
diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh
index cd0744d9..70d995ac 100644
--- a/ci/buildenv/debian-11.sh
+++ b/ci/buildenv/debian-11.sh
@@ -11,9 +11,11 @@ function install_buildenv() {
     apt-get install --no-install-recommends -y \
             autoconf \
             automake \
+            awk \
             bash-completion \
             bsdextrautils \
             ca-certificates \
+            cargo \
             ccache \
             clang \
             diffutils \
diff --git a/ci/buildenv/debian-12-cross-i686.sh
b/ci/buildenv/debian-12-cross-i686.sh
index fb90a64d..eb95d3a0 100644
--- a/ci/buildenv/debian-12-cross-i686.sh
+++ b/ci/buildenv/debian-12-cross-i686.sh
@@ -11,9 +11,11 @@ function install_buildenv() {
     apt-get install --no-install-recommends -y \
             autoconf \
             automake \
+            awk \
             bash-completion \
             bsdextrautils \
             ca-certificates \
+            cargo \
             ccache \
             diffutils \
             flake8 \
diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh
index cd0744d9..70d995ac 100644
--- a/ci/buildenv/debian-12.sh
+++ b/ci/buildenv/debian-12.sh
@@ -11,9 +11,11 @@ function install_buildenv() {
     apt-get install --no-install-recommends -y \
             autoconf \
             automake \
+            awk \
             bash-completion \
             bsdextrautils \
             ca-certificates \
+            cargo \
             ccache \
             clang \
             diffutils \
diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh
index cd0744d9..70d995ac 100644
--- a/ci/buildenv/debian-sid.sh
+++ b/ci/buildenv/debian-sid.sh
@@ -11,9 +11,11 @@ function install_buildenv() {
     apt-get install --no-install-recommends -y \
             autoconf \
             automake \
+            awk \
             bash-completion \
             bsdextrautils \
             ca-certificates \
+            cargo \
             ccache \
             clang \
             diffutils \
diff --git a/ci/buildenv/fedora-37.sh b/ci/buildenv/fedora-37.sh
index 227a8395..66241e32 100644
--- a/ci/buildenv/fedora-37.sh
+++ b/ci/buildenv/fedora-37.sh
@@ -9,8 +9,10 @@ function install_buildenv() {
     dnf install -y \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/fedora-38.sh b/ci/buildenv/fedora-38.sh
index 227a8395..66241e32 100644
--- a/ci/buildenv/fedora-38.sh
+++ b/ci/buildenv/fedora-38.sh
@@ -9,8 +9,10 @@ function install_buildenv() {
     dnf install -y \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh
index b6661fd2..20575d28 100644
--- a/ci/buildenv/fedora-rawhide.sh
+++ b/ci/buildenv/fedora-rawhide.sh
@@ -10,8 +10,10 @@ function install_buildenv() {
     dnf install -y \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh
index c77cd305..b1e6c0ad 100644
--- a/ci/buildenv/opensuse-leap-15.sh
+++ b/ci/buildenv/opensuse-leap-15.sh
@@ -9,8 +9,10 @@ function install_buildenv() {
     zypper install -y \
            autoconf \
            automake \
+           awk \
            bash-completion \
            ca-certificates \
+           cargo \
            ccache \
            clang \
            diffutils \
diff --git a/ci/buildenv/opensuse-tumbleweed.sh
b/ci/buildenv/opensuse-tumbleweed.sh
index b2febe6c..d36d4255 100644
--- a/ci/buildenv/opensuse-tumbleweed.sh
+++ b/ci/buildenv/opensuse-tumbleweed.sh
@@ -9,8 +9,10 @@ function install_buildenv() {
     zypper install -y \
            autoconf \
            automake \
+           awk \
            bash-completion \
            ca-certificates \
+           cargo \
            ccache \
            clang \
            diffutils \
diff --git a/ci/buildenv/ubuntu-2004.sh b/ci/buildenv/ubuntu-2004.sh
index 76404492..9b1eb4e2 100644
--- a/ci/buildenv/ubuntu-2004.sh
+++ b/ci/buildenv/ubuntu-2004.sh
@@ -11,9 +11,11 @@ function install_buildenv() {
     apt-get install --no-install-recommends -y \
             autoconf \
             automake \
+            awk \
             bash-completion \
             bsdmainutils \
             ca-certificates \
+            cargo \
             ccache \
             clang \
             diffutils \
diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh
index cd0744d9..70d995ac 100644
--- a/ci/buildenv/ubuntu-2204.sh
+++ b/ci/buildenv/ubuntu-2204.sh
@@ -11,9 +11,11 @@ function install_buildenv() {
     apt-get install --no-install-recommends -y \
             autoconf \
             automake \
+            awk \
             bash-completion \
             bsdextrautils \
             ca-certificates \
+            cargo \
             ccache \
             clang \
             diffutils \
diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index e09daaaf..7e886289 100644
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-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 py39-flake8 python3 qemu
valgrind'
+PKGS='autoconf automake awk 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 py39-flake8 python3 qemu
rust valgrind'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index e09daaaf..7e886289 100644
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-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 py39-flake8 python3 qemu
valgrind'
+PKGS='autoconf automake awk 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 py39-flake8 python3 qemu
rust valgrind'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index e09daaaf..7e886289 100644
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-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 py39-flake8 python3 qemu
valgrind'
+PKGS='autoconf automake awk 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 py39-flake8 python3 qemu
rust valgrind'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars
index 6f19a5e4..b7aa0025 100644
--- a/ci/cirrus/macos-13.vars
+++ b/ci/cirrus/macos-13.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='autoconf automake bash-completion ccache diffutils flake8 git glib
gnu-sed gnutls golang jq libev libtool libxml2 make ocaml ocaml-findlib perl
pkg-config python3 qemu'
+PKGS='autoconf automake awk bash-completion ccache diffutils flake8 git
glib gnu-sed gnutls golang jq libev libtool libxml2 make ocaml ocaml-findlib
perl pkg-config python3 qemu rust'
 PYPI_PKGS=''
 PYTHON='/opt/homebrew/bin/python3'
diff --git a/ci/containers/almalinux-8.Dockerfile
b/ci/containers/almalinux-8.Dockerfile
index 94466550..b6b99890 100644
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@@ -14,8 +14,10 @@ RUN dnf update -y && \
     dnf install -y \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/containers/alpine-317.Dockerfile
b/ci/containers/alpine-317.Dockerfile
index abd9476c..d88766f1 100644
--- a/ci/containers/alpine-317.Dockerfile
+++ b/ci/containers/alpine-317.Dockerfile
@@ -11,8 +11,10 @@ RUN apk update && \
     apk add \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/containers/alpine-318.Dockerfile
b/ci/containers/alpine-318.Dockerfile
index 7a3920ae..a0b24c19 100644
--- a/ci/containers/alpine-318.Dockerfile
+++ b/ci/containers/alpine-318.Dockerfile
@@ -11,8 +11,10 @@ RUN apk update && \
     apk add \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/containers/alpine-edge.Dockerfile
b/ci/containers/alpine-edge.Dockerfile
index d0fb0075..d6fe680b 100644
--- a/ci/containers/alpine-edge.Dockerfile
+++ b/ci/containers/alpine-edge.Dockerfile
@@ -11,8 +11,10 @@ RUN apk update && \
     apk add \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/containers/centos-stream-8.Dockerfile
b/ci/containers/centos-stream-8.Dockerfile
index e0d763ae..6d1f8fed 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -15,8 +15,10 @@ RUN dnf distro-sync -y && \
     dnf install -y \
         autoconf \
         automake \
+        awk \
         bash-completion \
         ca-certificates \
+        cargo \
         ccache \
         clang \
         diffutils \
diff --git a/ci/containers/debian-11-cross-i686.Dockerfile
b/ci/containers/debian-11-cross-i686.Dockerfile
index 385891fe..7b7d0dc7 100644
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@@ -13,9 +13,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get install --no-install-recommends -y \
                       autoconf \
                       automake \
+                      awk \
                       bash-completion \
                       bsdextrautils \
                       ca-certificates \
+                      cargo \
                       ccache \
                       diffutils \
                       flake8 \
diff --git a/ci/containers/debian-11.Dockerfile
b/ci/containers/debian-11.Dockerfile
index 0fe9d734..59e01480 100644
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@@ -13,9 +13,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get install --no-install-recommends -y \
                       autoconf \
                       automake \
+                      awk \
                       bash-completion \
                       bsdextrautils \
                       ca-certificates \
+                      cargo \
                       ccache \
                       clang \
                       diffutils \
diff --git a/ci/containers/debian-12-cross-i686.Dockerfile
b/ci/containers/debian-12-cross-i686.Dockerfile
index e11047c2..ff7805ef 100644
--- a/ci/containers/debian-12-cross-i686.Dockerfile
+++ b/ci/containers/debian-12-cross-i686.Dockerfile
@@ -13,9 +13,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get install --no-install-recommends -y \
                       autoconf \
                       automake \
+                      awk \
                       bash-completion \
                       bsdextrautils \
                       ca-certificates \
+                      cargo \
                       ccache \
                       diffutils \
                       flake8 \
diff --git a/ci/containers/debian-12.Dockerfile
b/ci/containers/debian-12.Dockerfile
index 49313eef..ee7dce07 100644
--- a/ci/containers/debian-12.Dockerfile
+++ b/ci/containers/debian-12.Dockerfile
@@ -13,9 +13,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get install --no-install-recommends -y \
                       autoconf \
                       automake \
+                      awk \
                       bash-completion \
                       bsdextrautils \
                       ca-certificates \
+                      cargo \
                       ccache \
                       clang \
                       diffutils \
diff --git a/ci/containers/debian-sid.Dockerfile
b/ci/containers/debian-sid.Dockerfile
index 6a19fb33..c82894d6 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -13,9 +13,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get install --no-install-recommends -y \
                       autoconf \
                       automake \
+                      awk \
                       bash-completion \
                       bsdextrautils \
                       ca-certificates \
+                      cargo \
                       ccache \
                       clang \
                       diffutils \
diff --git a/ci/containers/fedora-37.Dockerfile
b/ci/containers/fedora-37.Dockerfile
index 9536a7b8..597ec283 100644
--- a/ci/containers/fedora-37.Dockerfile
+++ b/ci/containers/fedora-37.Dockerfile
@@ -20,8 +20,10 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf install -y \
                autoconf \
                automake \
+               awk \
                bash-completion \
                ca-certificates \
+               cargo \
                ccache \
                clang \
                diffutils \
diff --git a/ci/containers/fedora-38.Dockerfile
b/ci/containers/fedora-38.Dockerfile
index 3ee4dae0..94bef2aa 100644
--- a/ci/containers/fedora-38.Dockerfile
+++ b/ci/containers/fedora-38.Dockerfile
@@ -20,8 +20,10 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf install -y \
                autoconf \
                automake \
+               awk \
                bash-completion \
                ca-certificates \
+               cargo \
                ccache \
                clang \
                diffutils \
diff --git a/ci/containers/fedora-rawhide.Dockerfile
b/ci/containers/fedora-rawhide.Dockerfile
index 66f27580..91cd0ab1 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -21,8 +21,10 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf install -y \
                autoconf \
                automake \
+               awk \
                bash-completion \
                ca-certificates \
+               cargo \
                ccache \
                clang \
                diffutils \
diff --git a/ci/containers/opensuse-leap-15.Dockerfile
b/ci/containers/opensuse-leap-15.Dockerfile
index f3b3fc3f..48f06a4a 100644
--- a/ci/containers/opensuse-leap-15.Dockerfile
+++ b/ci/containers/opensuse-leap-15.Dockerfile
@@ -10,8 +10,10 @@ RUN zypper update -y && \
     zypper install -y \
            autoconf \
            automake \
+           awk \
            bash-completion \
            ca-certificates \
+           cargo \
            ccache \
            clang \
            diffutils \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile
b/ci/containers/opensuse-tumbleweed.Dockerfile
index 3be06900..fff6c4fe 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -10,8 +10,10 @@ RUN zypper dist-upgrade -y && \
     zypper install -y \
            autoconf \
            automake \
+           awk \
            bash-completion \
            ca-certificates \
+           cargo \
            ccache \
            clang \
            diffutils \
diff --git a/ci/containers/ubuntu-2004.Dockerfile
b/ci/containers/ubuntu-2004.Dockerfile
index d95b90eb..35eaded4 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -13,9 +13,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get install --no-install-recommends -y \
                       autoconf \
                       automake \
+                      awk \
                       bash-completion \
                       bsdmainutils \
                       ca-certificates \
+                      cargo \
                       ccache \
                       clang \
                       diffutils \
diff --git a/ci/containers/ubuntu-2204.Dockerfile
b/ci/containers/ubuntu-2204.Dockerfile
index de066a02..1ad85c0d 100644
--- a/ci/containers/ubuntu-2204.Dockerfile
+++ b/ci/containers/ubuntu-2204.Dockerfile
@@ -13,9 +13,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get install --no-install-recommends -y \
                       autoconf \
                       automake \
+                      awk \
                       bash-completion \
                       bsdextrautils \
                       ca-certificates \
+                      cargo \
                       ccache \
                       clang \
                       diffutils \
-- 
2.41.0

Richard W.M. Jones

2023-Aug-16 10:56 UTC

head link

[Libguestfs] [libnbd PATCH] ci: Update lcitool to request cargo during CI

It's interesting that awk is required.  I've been attempting to keep
nbdkit from requiring awk (but we do require sed).

In config.log I see:

$ grep -i awk config.log 
configure:5226: checking for gawk
configure:5247: found /usr/bin/gawk
configure:5258: result: gawk
ac_cv_prog_AWK=gawk
AWK='gawk'

but I can't tell where that's coming from ...

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html

Eric Blake

2023-Aug-17 19:30 UTC

head link

[Libguestfs] [libnbd PATCH] ci: Update lcitool to request cargo during CI

On Tue, Aug 15, 2023 at 04:33:38PM -0500, Eric Blake
wrote:> Regenerate the CI build scripts with:
> 
>   ../libvirt-ci/bin/lcitool manifest ci/manifest.yml
> 
> using libvirt-ci bumped with a pending patch:
>   https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/424
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
> 
> CI is still not green, but I've been working on it today.  I'm
> currently waiting for a merge request to lcitool to land, if that
> happens quickly, I can rework this commit message.  I'm also playing
> with pushing this patch to a forked repo, to see how it fares, before
> sending it to the main repo.
I'm not sure why Alpine builds are now hanging during interop/
(happened in the previous commit, not new to this one).  There's
another thread discussing how to fix the failures now showing up from
too-old Rust.  But libvirt-ci accepted my merge request, so I tweaked
this, and it is now in as 49f98edd; and I will be doing a similar
update to nbdkit shortly.

Regarding awk failures seen in the previous commit for
opensuse-tumbleweed, the OpenSUSE folks answered at
https://bugzilla.suse.com/show_bug.cgi?id=1214365 that their change to
drop gawk from their bare-bones repository for minimal CI images was
intentional; but they didn't realize how many configure scripts depend
on at least some form of awk, so they may still be fixing that in some
other manner.  In the meantime, they were in agreement with my
resolution of explicitly requesting awk in any container with a
configure script where it is not already pulled in from something
else.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization:  qemu.org | libguestfs.org

Libguestfs - Aug 2023 - [libnbd PATCH] ci: Update lcitool to request cargo during CI

[Libguestfs] [libnbd PATCH] ci: Update lcitool to request cargo during CI

[Libguestfs] [libnbd PATCH] ci: Update lcitool to request cargo during CI

[Libguestfs] [libnbd PATCH] ci: Update lcitool to request cargo during CI