From nobody Sat Feb 7 10:08:11 2026 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 1551864876115878.7986884185506; Wed, 6 Mar 2019 01:34:36 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 197B388305; Wed, 6 Mar 2019 09:34:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E773217B40; Wed, 6 Mar 2019 09:34:33 +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 AA53E1819AFB; Wed, 6 Mar 2019 09:34:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x269YW8n014002 for ; Wed, 6 Mar 2019 04:34:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 52D261001DD6; Wed, 6 Mar 2019 09:34:32 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-60.ams2.redhat.com [10.36.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29AA81001938; Wed, 6 Mar 2019 09:34:30 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 6 Mar 2019 09:34:24 +0000 Message-Id: <20190306093424.22469-3-berrange@redhat.com> In-Reply-To: <20190306093424.22469-1-berrange@redhat.com> References: <20190306093424.22469-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/2] travis: convert ubuntu, centos & mingw builds to use new make rules 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 06 Mar 2019 09:34:34 +0000 (UTC) Change the travis configuration to invoke the new cibuild-$IMAGE target instead of directly running docker. This guarantees that when a developer runs cibuild-$IMAGE locally, the container build setup is identical to that used in Travis, with exception of the host kernel and docker version. Signed-off-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 48 ++++++++++-------------------------------------- 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55ba340a34..c093dbf550 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,26 +11,30 @@ matrix: - docker env: - IMAGE=3D"ubuntu-18" - - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dsystemd" - - DOCKER_CMD=3D"$LINUX_CMD" + - MAKE_ARGS=3D"syntax-check distcheck DISTCHECK_CONFIGURE_FLAGS=3D= --with-init-script-systemd" + script: + - make -f tests/Makefile.ci.inc cibuild-$IMAGE MAKE_ARGS=3D"$MAKE= _ARGS" - services: - docker env: - IMAGE=3D"centos-7" - - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dupstart" - - DOCKER_CMD=3D"$LINUX_CMD" + - MAKE_ARGS=3D"syntax-check distcheck DISTCHECK_CONFIGURE_FLAGS=3D= --with-init-script-systemd" + script: + - make -f tests/Makefile.ci.inc cibuild-$IMAGE MAKE_ARGS=3D"$MAKE= _ARGS" - services: - docker env: - IMAGE=3D"fedora-rawhide" - MINGW=3D"mingw32" - - DOCKER_CMD=3D"$MINGW_CMD" + script: + - make -f tests/Makefile.ci.inc cibuild-$IMAGE CONFIGURE=3D$MINGW-= configure MAKE_ARGS=3D"$MAKE_ARGS" - services: - docker env: - IMAGE=3D"fedora-rawhide" - MINGW=3D"mingw64" - - DOCKER_CMD=3D"$MINGW_CMD" + script: + - make -f tests/Makefile.ci.inc cibuild-$IMAGE CONFIGURE=3D$MINGW-= configure MAKE_ARGS=3D"$MAKE_ARGS" - compiler: clang language: c os: osx @@ -39,44 +43,12 @@ matrix: script: /bin/sh -xc "$MACOS_CMD" =20 -script: - - docker run - -v $(pwd):/build - -w /build - -e VIR_TEST_DEBUG=3D"$VIR_TEST_DEBUG" - -e MINGW=3D"$MINGW" - -e DISTCHECK_CONFIGURE_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" - "quay.io/libvirt/buildenv-$IMAGE:master" - /bin/sh -xc "$DOCKER_CMD" - git: submodules: true =20 env: global: - VIR_TEST_DEBUG=3D1 - - LINUX_CMD=3D" - ./autogen.sh && - make -j3 syntax-check && - make -j3 distcheck DISTCHECK_CONFIGURE_FLAGS=3D\"\$DISTCHECK_CONFI= GURE_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 - ) - " - - MINGW_CMD=3D" - NOCONFIGURE=3D1 ./autogen.sh && - \$MINGW-configure && - make -j3 || - ( - 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 - ) - " # We can't run 'distcheck' or 'syntax-check' because they fail on # macOS, but doing 'install' and 'dist' gives us some useful coverage - MACOS_CMD=3D" --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list