[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] tests: Refresh dockerfiles and FreeBSD vars with lcitool
From: |
Thomas Huth |
Subject: |
[PATCH 4/6] tests: Refresh dockerfiles and FreeBSD vars with lcitool |
Date: |
Wed, 24 Aug 2022 17:11:20 +0200 |
Run tests/lcitool/refresh to get the latest updates (like libslirp
in the FreeBSD files) from lcitool.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
tests/docker/dockerfiles/opensuse-leap.docker | 2 +-
tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars
b/.gitlab-ci.d/cirrus/freebsd-12.vars
index 8fa5a320e9..1a5959810f 100644
--- a/.gitlab-ci.d/cirrus/freebsd-12.vars
+++ b/.gitlab-ci.d/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='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage
cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib
gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs
libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv
perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy
spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage
cmocka ctags curl cyrus-sasl dbus diffutils dtc 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 perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy
spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars
b/.gitlab-ci.d/cirrus/freebsd-13.vars
index 8ed7e33a77..5e5aafd7e5 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 bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage
cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib
gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs
libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv
perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy
spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage
cmocka ctags curl cyrus-sasl dbus diffutils dtc 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 perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy
spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker
b/tests/docker/dockerfiles/opensuse-leap.docker
index 047a435ab5..193df305af 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -127,7 +127,7 @@ RUN zypper update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN pip3 install meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
b/tests/docker/dockerfiles/ubuntu2004.docker
index 99803b343b..e1f4ed7c80 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -137,7 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN pip3 install meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
--
2.31.1
- [PATCH v2 for-7.2 0/6] Drop libslirp submodule, Thomas Huth, 2022/08/24
- [PATCH 1/6] tests/docker: Update the debian-all-test-cross container to Debian 11, Thomas Huth, 2022/08/24
- [PATCH 2/6] tests/vm: Add libslirp to the VM tests, Thomas Huth, 2022/08/24
- [PATCH 3/6] tests/lcitool/libvirt-ci: Update the lcitool module to the latest version, Thomas Huth, 2022/08/24
- [PATCH 5/6] tests/avocado: Do not run tests that require libslirp if it is not available, Thomas Huth, 2022/08/24
- [PATCH 4/6] tests: Refresh dockerfiles and FreeBSD vars with lcitool,
Thomas Huth <=
- [PATCH v2 6/6] Remove the slirp submodule (i.e. compile only with an external libslirp), Thomas Huth, 2022/08/24
- Re: [PATCH v2 for-7.2 0/6] Drop libslirp submodule, Samuel Thibault, 2022/08/24