From nobody Sun May 5 03:16:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152830226169869.96501822219545; Wed, 6 Jun 2018 09:24:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E09B881DF2; Wed, 6 Jun 2018 16:24:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D1E810A31C5; Wed, 6 Jun 2018 16:24:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 34E814CA80; Wed, 6 Jun 2018 16:24:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w56GOHfb001593 for ; Wed, 6 Jun 2018 12:24:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4FDCE6B59C; Wed, 6 Jun 2018 16:24:17 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 038F96B599; Wed, 6 Jun 2018 16:24:11 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 6 Jun 2018 17:24:10 +0100 Message-Id: <20180606162410.24407-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2] travis: switch to using Ubuntu 16.04 and 18.04 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 06 Jun 2018 16:24:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The container images provided by Travis only support Ubuntu 14.04, however, Travis has ability to run docker, which allows the build script to use arbitrary OS images. This takes advantage of that to convert the build over to Ubuntu 16.04 and 18.04 This is using the official Ubuntu provided images and installing extra build deps required, as we previously did with Travis container images. With the switch to Docker though, this can be improved, by building custom Docker images with all the deps pre-installed which will cut down build time. This can be driven from the package lists in libvirt-jenkins-ci repo, to remove the duplication. This work for future improvement though, this just does the minimal conversion to match what we already do, but with newer distro. Signed-off-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 217 +++++++++++++++++++++++++++++----------------------- 1 file changed, 121 insertions(+), 96 deletions(-) diff --git a/.travis.yml b/.travis.yml index c71411dcae..1e2f946352 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ -sudo: false -language: c -cache: ccache +sudo: required +language: generic =20 branches: except: @@ -8,17 +7,41 @@ branches: =20 matrix: include: - - compiler: gcc - dist: trusty + - services: + - docker env: - - PYTHON=3D$(which python2) - - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dupstart" - - compiler: clang - dist: trusty - env: - - PYTHON=3D$(which python3) + - IMAGE_NAME=3Dubuntu:18.04 + - PYTHON=3Dpython3 - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dsystemd" + before_script: + - docker run + --privileged + -v $(pwd):/build + -w /build + -e VIR_TEST_DEBUG=3D"$VIR_TEST_DEBUG" + -e PACKAGES=3D"$PACKAGES" + -e DISTCHECK_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" + $IMAGE_NAME + /bin/sh -c "$DOCKER_CMD" + - services: + - docker + env: + - IMAGE_NAME=3Dubuntu:16.04 + - PYTHON=3Dpython2 + - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dupstart" + before_script: + - docker pull berrange/test + - docker run + --privileged + -v $(pwd):/build + -w /build + -e VIR_TEST_DEBUG=3D"$VIR_TEST_DEBUG" + -e PACKAGES=3D"$PACKAGES" + -e DISTCHECK_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" + $IMAGE_NAME + /bin/sh -c "$DOCKER_CMD" - compiler: clang + language: c os: osx env: - PATH=3D"/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec= :/usr/local/opt/rpcgen/bin:$PATH" @@ -27,80 +50,18 @@ matrix: - brew update - brew upgrade - brew install python ccache rpcgen yajl + before_script: + - ./autogen.sh --prefix=3D$(pwd)/install-root script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us # some useful coverage - make -j3 && make -j3 install && make -j3 dist + after_failure: + - echo '=3D=3D=3D LOG FILE(S) START =3D=3D=3D' + - find -name test-suite.log | xargs cat + - echo '=3D=3D=3D LOG FILE(S) END =3D=3D=3D' =20 -addons: - apt: - # Please keep this list sorted alphabetically - packages: - - augeas-tools - - autoconf - - automake - - autopoint - - bash-completion - - ccache - - dnsmasq-base - - dwarves - - ebtables - - gcc - - gettext - - glusterfs-client - - libacl1-dev - - libapparmor-dev - - libattr1-dev - - libaudit-dev - - libavahi-client-dev - - libblkid-dev - - libc6-dev - - libcap-ng-dev - - libc-dev-bin - - libcurl4-gnutls-dev - - libdbus-1-dev - - libdevmapper-dev - - libfuse-dev - - libgnutls-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 # broken on trusty since build #807 (2018-01-09) - - open-iscsi - - parted - - patch - - perl - - pkgconf - - policykit-1 - - qemu-utils - - radvd - - scrub - - sheepdog - - systemtap-sdt-dev - - xsltproc - - zfs-fuse =20 git: submodules: true @@ -108,23 +69,87 @@ git: env: global: - VIR_TEST_DEBUG=3D1 - -before_script: - - ./autogen.sh --prefix=3D$(pwd)/install-root - -script: - - make -j3 && make -j3 syntax-check && make -j3 distcheck DISTCHECK_CONF= IGURE_FLAGS=3D$DISTCHECK_CONFIGURE_FLAGS - -after_failure: - - echo '=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D' - - 'ver=3D$(sed -n "s/AC_INIT(\[libvirt\], \[\([0-9.]*\)\],.*/\1/p" confi= gure.ac); - if [ -f $(pwd)/tests/test-suite.log ]; then - cat $(pwd)/tests/test-suite.log; - elif [ -f libvirt-$ver/_build/tests/test-suite.log ]; then - cat libvirt-$ver/_build/tests/test-suite.log; - else - echo "=3D=3D=3D NO LOG FILE FOUND =3D=3D=3D"; - fi' + - DOCKER_CMD=3D" + apt-get update && + apt-get install -y \$PACKAGES && + ./autogen.sh --prefix=3D$(pwd)/install-root && + make -j3 && + make -j3 syntax-check && + make -j3 distcheck DISTCHECK_CONFIGURE_FLAGS=3D\"\$DISTCHECK_FLAGS= \" || + ( + echo '=3D=3D=3D LOG FILE(S) START =3D=3D=3D' + find -name test-suite.log | xargs cat + echo '=3D=3D=3D LOG FILE(S) END =3D=3D=3D' + exit 1 + ) + " + # Please keep this list sorted alphabetically + - PACKAGES=3D" + 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 + " =20 notifications: irc: --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list