Bios bits avocado tests need mformat (provided by the mtools package) and
xorriso tools in order to run within gitlab CI containers. Add those
dependencies within the Dockerfiles so that containers can be built with
those tools present.
CC: m...@redhat.com
CC: berra...@redhat.com
Signed-off-by: Ani Sinha <anisi...@redhat.com>
---
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
.gitlab-ci.d/cirrus/macos-12.vars | 2 +-
tests/docker/dockerfiles/alpine.docker | 2 ++
tests/docker/dockerfiles/centos8.docker | 2 ++
tests/docker/dockerfiles/debian-amd64-cross.docker | 2 ++
tests/docker/dockerfiles/debian-amd64.docker | 2 ++
tests/docker/dockerfiles/debian-arm64-cross.docker | 2 ++
tests/docker/dockerfiles/debian-armel-cross.docker | 2 ++
tests/docker/dockerfiles/debian-armhf-cross.docker | 2 ++
tests/docker/dockerfiles/debian-mips64el-cross.docker | 2 ++
tests/docker/dockerfiles/debian-mipsel-cross.docker | 2 ++
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 2 ++
tests/docker/dockerfiles/debian-s390x-cross.docker | 2 ++
tests/docker/dockerfiles/fedora-win32-cross.docker | 2 ++
tests/docker/dockerfiles/fedora-win64-cross.docker | 2 ++
tests/docker/dockerfiles/fedora.docker | 2 ++
tests/docker/dockerfiles/opensuse-leap.docker | 2 ++
tests/docker/dockerfiles/ubuntu2004.docker | 2 ++
tests/docker/dockerfiles/ubuntu2204.docker | 2 ++
tests/lcitool/projects/qemu.yml | 2 ++
20 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars
b/.gitlab-ci.d/cirrus/freebsd-13.vars
index 7622c849b2..aea3a25fb3 100644
--- a/.gitlab-ci.d/cirrus/freebsd-13.vars
+++ b/.gitlab-ci.d/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='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache
cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex
fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi
libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm
lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy
py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3
rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir
virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache
cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex
fusefs-libs3 gettext git glib gmake gnutls gsed 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 py39-numpy
py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3
rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir
virglrenderer vte3 xorriso zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-12.vars
b/.gitlab-ci.d/cirrus/macos-12.vars
index da6aa6469b..ceb294e153 100644
--- a/.gitlab-ci.d/cirrus/macos-12.vars
+++ b/.gitlab-ci.d/cirrus/macos-12.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 bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc
flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c
libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1
libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3
rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir
vde vte3 zlib zstd'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc
flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c
libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1
libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config
python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract
usbredir vde vte3 xorriso zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme'
PYTHON='/opt/homebrew/bin/python3'
diff --git a/tests/docker/dockerfiles/alpine.docker
b/tests/docker/dockerfiles/alpine.docker
index 81c70aeaf9..40ac3af096 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -67,6 +67,7 @@ RUN apk update && \
make \
mesa-dev \
meson \
+ mtools \
multipath-tools \
musl-dev \
ncurses-dev \
@@ -108,6 +109,7 @@ RUN apk update && \
which \
xen-dev \
xfsprogs-dev \
+ xorriso \
zlib-dev \
zlib-static \
zstd \
diff --git a/tests/docker/dockerfiles/centos8.docker
b/tests/docker/dockerfiles/centos8.docker
index 1a6a9087c1..c1691ac2a3 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -82,6 +82,7 @@ RUN dnf distro-sync -y && \
lzo-devel \
make \
mesa-libgbm-devel \
+ mtools \
ncurses-devel \
nettle-devel \
ninja-build \
@@ -114,6 +115,7 @@ RUN dnf distro-sync -y && \
vte291-devel \
which \
xfsprogs-devel \
+ xorriso \
zlib-devel \
zlib-static \
zstd && \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker
b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 2e7eb445f1..a33d677de3 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-amd64.docker
b/tests/docker/dockerfiles/debian-amd64.docker
index 28e2fa81b1..4126f66fa1 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -103,6 +103,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
multipath-tools \
ncat \
nettle-dev \
@@ -127,6 +128,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tesseract-ocr \
tesseract-ocr-eng \
xfslibs-dev \
+ xorriso \
zlib1g-dev \
zstd && \
eatmydata apt-get autoremove -y && \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker
b/tests/docker/dockerfiles/debian-arm64-cross.docker
index f558770f84..538bcd998c 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker
b/tests/docker/dockerfiles/debian-armel-cross.docker
index f3d7e07cce..37cc74d3c5 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker
b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 531c556ad5..f423ffc136 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker
b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 816dbd2911..90c1652135 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker
b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index b115b29af3..38629af0c9 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 301bddb536..0a66dd3af2 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker
b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 5d27c91c17..0f7b6ede55 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
ncat \
ninja-build \
openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
+ xorriso \
zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker
b/tests/docker/dockerfiles/fedora-win32-cross.docker
index e7966ec7fd..209165fd66 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -38,6 +38,7 @@ exec "$@"\n' > /usr/bin/nosync && \
llvm \
make \
meson \
+ mtools \
ninja-build \
nmap-ncat \
openssh-clients \
@@ -59,6 +60,7 @@ exec "$@"\n' > /usr/bin/nosync && \
tesseract-langpack-eng \
util-linux \
which \
+ xorriso \
zstd && \
nosync dnf autoremove -y && \
nosync dnf clean all -y
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 86c3a8f2ac..784e3e4c2d 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -38,6 +38,7 @@ exec "$@"\n' > /usr/bin/nosync && \
llvm \
make \
meson \
+ mtools \
ninja-build \
nmap-ncat \
openssh-clients \
@@ -59,6 +60,7 @@ exec "$@"\n' > /usr/bin/nosync && \
tesseract-langpack-eng \
util-linux \
which \
+ xorriso \
zstd && \
nosync dnf autoremove -y && \
nosync dnf clean all -y
diff --git a/tests/docker/dockerfiles/fedora.docker
b/tests/docker/dockerfiles/fedora.docker
index b698b7595d..a9ad65a76d 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -90,6 +90,7 @@ exec "$@"\n' > /usr/bin/nosync && \
make \
mesa-libgbm-devel \
meson \
+ mtools \
ncurses-devel \
nettle-devel \
ninja-build \
@@ -128,6 +129,7 @@ exec "$@"\n' > /usr/bin/nosync && \
which \
xen-devel \
xfsprogs-devel \
+ xorriso \
zlib-devel \
zlib-static \
zstd && \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker
b/tests/docker/dockerfiles/opensuse-leap.docker
index afb9f5419f..0bc6aff53c 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -82,6 +82,7 @@ RUN zypper update -y && \
lzo-devel \
make \
mkisofs \
+ mtools \
ncat \
ncurses-devel \
ninja \
@@ -111,6 +112,7 @@ RUN zypper update -y && \
which \
xen-devel \
xfsprogs-devel \
+ xorriso \
zlib-devel \
zlib-devel-static \
zstd && \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
b/tests/docker/dockerfiles/ubuntu2004.docker
index aa2f5ca7b4..57b7bfe9cb 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -100,6 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
llvm \
locales \
make \
+ mtools \
multipath-tools \
ncat \
nettle-dev \
@@ -126,6 +127,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tesseract-ocr \
tesseract-ocr-eng \
xfslibs-dev \
+ xorriso \
zlib1g-dev \
zstd && \
eatmydata apt-get autoremove -y && \
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker
b/tests/docker/dockerfiles/ubuntu2204.docker
index 3f7d30e5d0..eaba38d854 100644
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -103,6 +103,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
make \
meson \
+ mtools \
multipath-tools \
ncat \
nettle-dev \
@@ -127,6 +128,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tesseract-ocr \
tesseract-ocr-eng \
xfslibs-dev \
+ xorriso \
zlib1g-dev \
zstd && \
eatmydata apt-get autoremove -y && \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index af3700379a..924208df32 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -73,6 +73,7 @@ packages:
- llvm
- lttng-ust
- lzo
+ - mtools
- netcat
- nettle
- ninja
@@ -116,6 +117,7 @@ packages:
- which
- xen
- xfsprogs
+ - xorriso
- zstdtools
- zlib
- zlib-static
--
2.31.1
