Commit d19bb837 authored by Daniel Berrange's avatar Daniel Berrange 💬

ci: refresh dockerfiles for changed libvirt build system

Libvirt changed from autotools to meson. All the containers need
refreshing and the CI recipes updated.
Signed-off-by: Daniel Berrange's avatarDaniel P. Berrangé <[email protected]>
parent 8573078c
Pipeline #194781640 passed with stages
in 20 minutes and 2 seconds
......@@ -28,18 +28,18 @@ stages:
- export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
- export SCRATCH_DIR="/tmp/scratch"
- export VROOT="$SCRATCH_DIR/vroot"
- export LD_LIBRARY_PATH="$VROOT/lib"
- export LIBDIR="$VROOT/lib"
- export LD_LIBRARY_PATH="$LIBDIR"
- export PATH="$VROOT/bin:$PATH"
- export PKG_CONFIG_PATH="$VROOT/lib/pkgconfig"
- export PKG_CONFIG_PATH="$LIBDIR/pkgconfig"
script:
- pushd "$PWD"
- mkdir -p "$SCRATCH_DIR"
- cd "$SCRATCH_DIR"
- git clone --depth 1 https://gitlab.com/libvirt/libvirt.git
- mkdir libvirt/build
- cd libvirt/build
- ../autogen.sh --prefix="$VROOT" --without-libvirtd
- $MAKE install
- cd libvirt
- meson build -Ddriver_libvirtd=disabled "--prefix=$VROOT" "--libdir=$LIBDIR"
- ninja -C build install
- popd
- ./autogen.sh
- make distcheck
......@@ -75,11 +75,6 @@ centos-7-container:
variables:
NAME: centos-7
debian-9-container:
<<: *container_job_definition
variables:
NAME: debian-9
debian-10-container:
<<: *container_job_definition
variables:
......@@ -132,11 +127,6 @@ centos-7-dist-build:
variables:
NAME: centos-7
debian-9-dist-build:
<<: *dist_build_job_definition
variables:
NAME: debian-9
debian-10-dist-build:
<<: *dist_build_job_definition
variables:
......
......@@ -58,6 +58,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
ninja-build \
patch \
perl \
perl-App-cpanminus \
php-devel \
php-pecl-imagick \
pkgconfig \
......@@ -69,7 +70,8 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
screen \
strace \
sudo \
vim && \
vim \
xz && \
yum autoremove -y && \
yum clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \
......@@ -77,7 +79,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
meson==0.49.0
meson==0.54.0
ENV LANG "en_US.UTF-8"
......
......@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
......@@ -25,7 +26,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
lsof \
make \
meson \
net-tools \
ninja-build \
patch \
......@@ -34,13 +34,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
php-imagick \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
screen \
strace \
sudo \
vim \
xsltproc && \
xsltproc \
xz-utils && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
......@@ -49,6 +51,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
meson==0.54.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
......
FROM debian:9
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get dist-upgrade -y && \
apt-get install --no-install-recommends -y \
autoconf \
automake \
autopoint \
bash \
bash-completion \
ca-certificates \
ccache \
chrony \
gcc \
gdb \
gettext \
git \
libc6-dev \
libtool \
libtool-bin \
libvirt-dev \
libxml2-dev \
libxml2-utils \
locales \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
php-dev \
php-imagick \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
screen \
strace \
sudo \
vim \
xsltproc && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
meson==0.49.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3"
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
......@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
......@@ -34,13 +35,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
php-imagick \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
screen \
strace \
sudo \
vim \
xsltproc && \
xsltproc \
xz-utils && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
......
......@@ -24,28 +24,33 @@ RUN dnf update -y && \
libxslt \
lsof \
make \
meson \
net-tools \
ninja-build \
patch \
perl \
perl-App-cpanminus \
php-devel \
php-pecl-imagick \
pkgconfig \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
rpm-build \
screen \
strace \
sudo \
vim && \
vim \
xz && \
dnf autoremove -y && \
dnf clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
meson==0.54.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
......
......@@ -33,11 +33,13 @@ RUN dnf update -y && \
ninja-build \
patch \
perl \
perl-App-cpanminus \
php-devel \
php-pecl-imagick \
pkgconfig \
python3 \
python3-docutils \
python3-pip \
python3-setuptools \
python3-wheel \
rpcgen \
......@@ -45,7 +47,8 @@ RUN dnf update -y && \
screen \
strace \
sudo \
vim && \
vim \
xz && \
dnf autoremove -y && \
dnf clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \
......
......@@ -30,17 +30,20 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
ninja-build \
patch \
perl \
perl-App-cpanminus \
php-devel \
php-pecl-imagick \
pkgconfig \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
rpm-build \
screen \
strace \
sudo \
vim && \
vim \
xz && \
dnf autoremove -y && \
dnf clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \
......
......@@ -28,6 +28,7 @@ RUN zypper update -y && \
ninja \
patch \
perl \
perl-App-cpanminus \
php-devel \
php-imagick \
pkgconfig \
......@@ -39,14 +40,15 @@ RUN zypper update -y && \
screen \
strace \
sudo \
vim && \
vim \
xz && \
zypper clean --all && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
meson==0.49.0
meson==0.54.0
ENV LANG "en_US.UTF-8"
......
......@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
......@@ -40,7 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
strace \
sudo \
vim \
xsltproc && \
xsltproc \
xz-utils && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
......@@ -50,7 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
meson==0.49.0
meson==0.54.0
ENV LANG "en_US.UTF-8"
......
......@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
......@@ -25,7 +26,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
lsof \
make \
meson \
net-tools \
ninja-build \
patch \
......@@ -34,13 +34,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
php-imagick \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
screen \
strace \
sudo \
vim \
xsltproc && \
xsltproc \
xz-utils && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
......@@ -49,6 +51,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
meson==0.54.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
......
......@@ -14,7 +14,7 @@ then
exit 1
fi
HOSTS=$($LCITOOL hosts | grep -v freebsd | grep -v libvirt-centos-8)
HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|centos-8|centos-stream|macos)')
for host in $HOSTS
do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment