提交 4016b467 编写于 作者: A Andrea Bolognani

travis: Use pre-built Docker images

Instead of starting from the minimal Ubuntu 18.04 base
image and installing all requirements at build time,
use a Docker image that has been specifically tailored
at building libvirt and thus already includes all
required packages.
Signed-off-by: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 53783395
...@@ -10,7 +10,7 @@ matrix: ...@@ -10,7 +10,7 @@ matrix:
- services: - services:
- docker - docker
env: env:
- IMAGE=ubuntu:18.04 - IMAGE="ubuntu-18"
- DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd" - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd"
- DOCKER_CMD="$LINUX_CMD" - DOCKER_CMD="$LINUX_CMD"
- compiler: clang - compiler: clang
...@@ -23,13 +23,11 @@ matrix: ...@@ -23,13 +23,11 @@ matrix:
script: script:
- docker run - docker run
--privileged
-v $(pwd):/build -v $(pwd):/build
-w /build -w /build
-e VIR_TEST_DEBUG="$VIR_TEST_DEBUG" -e VIR_TEST_DEBUG="$VIR_TEST_DEBUG"
-e PACKAGES="$PACKAGES"
-e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" -e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS"
"$IMAGE" "libvirt/buildenv-$IMAGE"
/bin/sh -xc "$DOCKER_CMD" /bin/sh -xc "$DOCKER_CMD"
git: git:
...@@ -39,8 +37,6 @@ env: ...@@ -39,8 +37,6 @@ env:
global: global:
- VIR_TEST_DEBUG=1 - VIR_TEST_DEBUG=1
- LINUX_CMD=" - LINUX_CMD="
apt-get update &&
apt-get install -y \$PACKAGES &&
./autogen.sh && ./autogen.sh &&
make -j3 syntax-check && make -j3 syntax-check &&
make -j3 distcheck DISTCHECK_CONFIGURE_FLAGS=\"\$DISTCHECK_CONFIGURE_FLAGS\" || make -j3 distcheck DISTCHECK_CONFIGURE_FLAGS=\"\$DISTCHECK_CONFIGURE_FLAGS\" ||
...@@ -67,73 +63,6 @@ env: ...@@ -67,73 +63,6 @@ env:
exit 1 exit 1
) )
" "
# Please keep this list sorted alphabetically
- PACKAGES="
augeas-tools
autoconf
automake
autopoint
bash-completion
ccache
dnsmasq-base
dwarves
ebtables
gcc
gettext
git
glusterfs-client
libacl1-dev
libapparmor-dev
libattr1-dev
libaudit-dev
libavahi-client-dev
libblkid-dev
libc6-dev
libcap-ng-dev
libc-dev-bin
libdbus-1-dev
libdevmapper-dev
libfuse-dev
libgnutls28-dev
libnetcf-dev
libnl-3-dev
libnl-route-3-dev
libnuma-dev
libopenwsman-dev
libparted-dev
libpcap-dev
libpciaccess-dev
librbd-dev
libreadline-dev
libsanlock-dev
libsasl2-dev
libselinux1-dev
libssh2-1-dev
libssh-dev
libtirpc-dev
libtool
libudev-dev
libxen-dev
libxml2-dev
libxml2-utils
libyajl-dev
lvm2
make
nfs-common
open-iscsi
parted
patch
perl
pkgconf
policykit-1
qemu-utils
radvd
scrub
sheepdog
systemtap-sdt-dev
xsltproc
zfs-fuse
"
notifications: notifications:
irc: irc:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册