tests/docker: add coreutils to the package list

We need coreutils to run the IO tests so we need to include it in the package list. Now we have the latest libvirt we can do that. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-ID: <20251117115523.3993105-5-alex.bennee@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
9 months ago · 556386b0ae
24 changed files with 24 additions and 2 deletions
--- a/.gitlab-ci.d/cirrus/freebsd-14.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-14.vars
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip'
-PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka coreutils ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso zstd'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
--- a/.gitlab-ci.d/cirrus/macos-14.vars
+++ b/.gitlab-ci.d/cirrus/macos-14.vars
@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 vulkan-tools xorriso zlib zstd'
+PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka coreutils ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 vulkan-tools xorriso zlib zstd'
 PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
 PYTHON='/opt/homebrew/bin/python3'
--- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml
+++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml
@ -14,6 +14,7 @@ packages:
  - ca-certificates
  - ccache
  - clang
+  - coreutils
  - dbus
  - debianutils
  - diffutils
--- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
@ -14,6 +14,7 @@ packages:
  - ca-certificates
  - ccache
  - clang
+  - coreutils
  - dbus
  - debianutils
  - diffutils
--- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
@ -14,6 +14,7 @@ packages:
  - ca-certificates
  - ccache
  - clang
+  - coreutils
  - dbus
  - debianutils
  - diffutils
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@ -22,6 +22,7 @@ RUN apk update && \
        ceph-dev \
        clang \
        cmocka-dev \
+        coreutils \
        ctags \
        curl-dev \
        cyrus-sasl-dev \
--- a/tests/docker/dockerfiles/centos9.docker
+++ b/tests/docker/dockerfiles/centos9.docker
@ -26,6 +26,7 @@ RUN dnf distro-sync -y && \
        ccache \
        clang \
        compiler-rt \
+        coreutils-single \
        ctags \
        cyrus-sasl-devel \
        daxctl-devel \
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      bzip2 \
                      ca-certificates \
                      ccache \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@ -20,6 +20,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      ca-certificates \
                      ccache \
                      clang \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/docker/dockerfiles/fedora-rust-nightly.docker
+++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker
@ -33,6 +33,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               ccache \
               clang \
               compiler-rt \
+               coreutils \
               ctags \
               cyrus-sasl-devel \
               daxctl-devel \
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@ -26,6 +26,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               ca-certificates \
               ccache \
               compiler-rt \
+               coreutils \
               ctags \
               dbus-daemon \
               diffutils \
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@ -33,6 +33,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               ccache \
               clang \
               compiler-rt \
+               coreutils \
               ctags \
               cyrus-sasl-devel \
               daxctl-devel \
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@ -20,6 +20,7 @@ RUN zypper update -y && \
           ccache \
           clang \
           clang-devel \
+           coreutils \
           ctags \
           cyrus-sasl-devel \
           dbus-1 \
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      ca-certificates \
                      ccache \
                      clang \
+                      coreutils \
                      dbus \
                      debianutils \
                      diffutils \
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@ -13,6 +13,7 @@ packages:
 - clang
 - cmocka
 - column
+ - coreutils
 - ctags
 - cyrus-sasl
 - daxctl
--- a/tests/vm/generated/freebsd.json
+++ b/tests/vm/generated/freebsd.json
@ -15,6 +15,7 @@
    "capstone4",
    "ccache4",
    "cmocka",
+    "coreutils",
    "ctags",
    "curl",
    "cyrus-sasl",