- The Cirrus CI variables are now sorted
- The dockerfiles update commands changed for some distros
- Meson in CentOS is now new enough to use
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
ci/cirrus/freebsd-12.vars | 7 +++++--
ci/cirrus/freebsd-13.vars | 7 +++++--
ci/cirrus/freebsd-current.vars | 7 +++++--
ci/cirrus/macos-11.vars | 7 +++++--
ci/containers/centos-8.Dockerfile | 7 +------
ci/containers/centos-stream-8.Dockerfile | 7 +------
ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 2 +-
ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 2 +-
ci/containers/fedora-rawhide.Dockerfile | 2 +-
ci/containers/opensuse-tumbleweed.Dockerfile | 2 +-
10 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 4318b255e9..4845d8d461 100644
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -4,10 +4,13 @@
#
#
https://gitlab.com/libvirt/libvirt-ci
-PACKAGING_COMMAND='pkg'
CCACHE='/usr/local/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
-PYTHON='/usr/local/bin/python3'
+PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
PKGS='augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils
diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap
libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils
py38-flake8 python3 qemu radvd readline yajl'
+PYPI_PKGS=''
+PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index 4318b255e9..4845d8d461 100644
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@@ -4,10 +4,13 @@
#
#
https://gitlab.com/libvirt/libvirt-ci
-PACKAGING_COMMAND='pkg'
CCACHE='/usr/local/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
-PYTHON='/usr/local/bin/python3'
+PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
PKGS='augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils
diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap
libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils
py38-flake8 python3 qemu radvd readline yajl'
+PYPI_PKGS=''
+PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index 4318b255e9..4845d8d461 100644
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -4,10 +4,13 @@
#
#
https://gitlab.com/libvirt/libvirt-ci
-PACKAGING_COMMAND='pkg'
CCACHE='/usr/local/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
-PYTHON='/usr/local/bin/python3'
+PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
PKGS='augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils
diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap
libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils
py38-flake8 python3 qemu radvd readline yajl'
+PYPI_PKGS=''
+PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars
index 065d86aa45..6bc25aa380 100644
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@@ -4,10 +4,13 @@
#
#
https://gitlab.com/libvirt/libvirt-ci
-PACKAGING_COMMAND='brew'
CCACHE='/usr/local/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
-PYTHON='/usr/local/bin/python3'
+PACKAGING_COMMAND='brew'
PIP3='/usr/local/bin/pip3'
PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8
gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make
meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
+PYPI_PKGS=''
+PYTHON='/usr/local/bin/python3'
diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
index 5ac1e45459..05793fee4c 100644
--- a/ci/containers/centos-8.Dockerfile
+++ b/ci/containers/centos-8.Dockerfile
@@ -63,6 +63,7 @@ RUN dnf update -y && \
libxslt \
lvm2 \
make \
+ meson \
netcf-devel \
nfs-utils \
ninja-build \
@@ -76,9 +77,6 @@ RUN dnf update -y && \
python3 \
python3-docutils \
python3-flake8 \
- python3-pip \
- python3-setuptools \
- python3-wheel \
qemu-img \
radvd \
readline-devel \
@@ -99,9 +97,6 @@ RUN dnf update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN pip3 install \
- meson==0.56.0
-
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
diff --git a/ci/containers/centos-stream-8.Dockerfile
b/ci/containers/centos-stream-8.Dockerfile
index 6baf576580..895fc06aa1 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -63,6 +63,7 @@ RUN dnf update -y && \
libxslt \
lvm2 \
make \
+ meson \
netcf-devel \
nfs-utils \
ninja-build \
@@ -76,9 +77,6 @@ RUN dnf update -y && \
python3 \
python3-docutils \
python3-flake8 \
- python3-pip \
- python3-setuptools \
- python3-wheel \
qemu-img \
radvd \
readline-devel \
@@ -99,9 +97,6 @@ RUN dnf update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN pip3 install \
- meson==0.56.0
-
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 8b9a9d61ae..31006b8092 100644
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -17,7 +17,7 @@ else\n\
fi\n\
exec "$@"' > /usr/bin/nosync && \
chmod +x /usr/bin/nosync && \
- nosync dnf update -y && \
+ nosync dnf distro-sync -y && \
nosync dnf install -y \
augeas \
bash-completion \
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index 6293658420..c9b01984b5 100644
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -17,7 +17,7 @@ else\n\
fi\n\
exec "$@"' > /usr/bin/nosync && \
chmod +x /usr/bin/nosync && \
- nosync dnf update -y && \
+ nosync dnf distro-sync -y && \
nosync dnf install -y \
augeas \
bash-completion \
diff --git a/ci/containers/fedora-rawhide.Dockerfile
b/ci/containers/fedora-rawhide.Dockerfile
index 74e1f01483..97476535b9 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -17,7 +17,7 @@ else\n\
fi\n\
exec "$@"' > /usr/bin/nosync && \
chmod +x /usr/bin/nosync && \
- nosync dnf update -y && \
+ nosync dnf distro-sync -y && \
nosync dnf install -y \
audit-libs-devel \
augeas \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile
b/ci/containers/opensuse-tumbleweed.Dockerfile
index be2d6b6d25..4687f503d7 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -6,7 +6,7 @@
FROM
registry.opensuse.org/opensuse/tumbleweed:latest
-RUN zypper update -y && \
+RUN zypper dist-upgrade -y && \
zypper install -y \
audit-devel \
augeas \
--
2.33.1