From nobody Thu May 2 20:31:21 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 1528386918798570.7603059924387; Thu, 7 Jun 2018 08:55:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DAEEC04AC58; Thu, 7 Jun 2018 15:55:17 +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 098B66315C; Thu, 7 Jun 2018 15:55:17 +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 A15F71801218; Thu, 7 Jun 2018 15:55:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w57FsoQL018114 for ; Thu, 7 Jun 2018 11:54:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id E7ABD201E903; Thu, 7 Jun 2018 15:54:49 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-79.brq.redhat.com [10.40.204.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C66E201E8ED for ; Thu, 7 Jun 2018 15:54:49 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Jun 2018 17:54:40 +0200 Message-Id: <20180607155443.4295-2-abologna@redhat.com> In-Reply-To: <20180607155443.4295-1-abologna@redhat.com> References: <20180607155443.4295-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/4] travis: Skip macOS upgrade 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 07 Jun 2018 15:55:18 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Upgrading takes quite a bit of time, doesn't offer any real value and causes a lot of grief. Let's just skip it. We need to install xz explicitly now, since it's required to make dist and no longer being dragged in by Python 3. Signed-off-by: Andrea Bolognani --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac0d48a606..f99e1cd6e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,8 @@ matrix: env: - PATH=3D"/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec= :/usr/local/opt/rpcgen/bin:$PATH" before_install: - - brew uninstall python mercurial postgis sfcgal cgal gdal - brew update - - brew upgrade - - brew install python ccache rpcgen yajl + - brew install ccache rpcgen xz yajl before_script: - ./autogen.sh --prefix=3D$(pwd)/install-root script: --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 20:31:21 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 1528386927556133.71530561973975; Thu, 7 Jun 2018 08:55:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9BEA308A953; Thu, 7 Jun 2018 15:55:25 +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 7FE635D9C5; Thu, 7 Jun 2018 15:55:25 +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 20954180BA80; Thu, 7 Jun 2018 15:55:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w57FsoMX018124 for ; Thu, 7 Jun 2018 11:54:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id CEADC201E903; Thu, 7 Jun 2018 15:54:50 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-79.brq.redhat.com [10.40.204.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 440DA201E8ED for ; Thu, 7 Jun 2018 15:54:50 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Jun 2018 17:54:41 +0200 Message-Id: <20180607155443.4295-3-abologna@redhat.com> In-Reply-To: <20180607155443.4295-1-abologna@redhat.com> References: <20180607155443.4295-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] travis: Don't duplicate Docker invocation 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 07 Jun 2018 15:55:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" All variable parts are taken from the environment, so we can exploit inheritance and avoid duplication. This will become more important as we start building on additional platforms. Signed-off-by: Andrea Bolognani --- .travis.yml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index f99e1cd6e6..4afaca313b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,31 +12,11 @@ matrix: env: - IMAGE=3Dubuntu:18.04 - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dsystemd" - script: - - docker run - --privileged - -v $(pwd):/build - -w /build - -e VIR_TEST_DEBUG=3D"$VIR_TEST_DEBUG" - -e PACKAGES=3D"$PACKAGES" - -e DISTCHECK_CONFIGURE_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" - "$IMAGE" - /bin/sh -xc "$DOCKER_CMD" - services: - docker env: - IMAGE=3Dubuntu:16.04 - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dupstart" - script: - - docker run - --privileged - -v $(pwd):/build - -w /build - -e VIR_TEST_DEBUG=3D"$VIR_TEST_DEBUG" - -e PACKAGES=3D"$PACKAGES" - -e DISTCHECK_CONFIGURE_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" - "$IMAGE" - /bin/sh -xc "$DOCKER_CMD" - compiler: clang language: c os: osx @@ -57,6 +37,17 @@ matrix: - find -name test-suite.log | xargs cat - echo '=3D=3D=3D LOG FILE(S) END =3D=3D=3D' =20 +script: + - docker run + --privileged + -v $(pwd):/build + -w /build + -e VIR_TEST_DEBUG=3D"$VIR_TEST_DEBUG" + -e PACKAGES=3D"$PACKAGES" + -e DISTCHECK_CONFIGURE_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" + "$IMAGE" + /bin/sh -xc "$DOCKER_CMD" + git: submodules: true =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 20:31:21 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 152838689903216.385250099880636; Thu, 7 Jun 2018 08:54:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 428A830820CF; Thu, 7 Jun 2018 15:54:57 +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 B3687308BDA2; Thu, 7 Jun 2018 15:54:56 +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 2E76E4CA80; Thu, 7 Jun 2018 15:54:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w57Fsp6H018129 for ; Thu, 7 Jun 2018 11:54:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id AB41E201E903; Thu, 7 Jun 2018 15:54:51 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-79.brq.redhat.com [10.40.204.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E786201E8ED for ; Thu, 7 Jun 2018 15:54:51 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Jun 2018 17:54:42 +0200 Message-Id: <20180607155443.4295-4-abologna@redhat.com> In-Reply-To: <20180607155443.4295-1-abologna@redhat.com> References: <20180607155443.4295-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] travis: Introduce MACOS_CMD 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: , MIME-Version: 1.0 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.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 07 Jun 2018 15:54:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It mirrors the existing DOCKER_CMD, both in how it's defined as part of the environment and how it's called by passing it directly to the shell. In addition to making the configuration more consistent, this also allows us to move from having the macOS build script divided into four steps, some of which have slightly different semantics and the relationship between which is not immediately obvious without consulting the documentation, to a single straightforward shell invocation. Signed-off-by: Andrea Bolognani --- .travis.yml | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4afaca313b..ec45d78303 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,20 +22,8 @@ matrix: os: osx env: - PATH=3D"/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec= :/usr/local/opt/rpcgen/bin:$PATH" - before_install: - - brew update - - brew install ccache rpcgen xz 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' + /bin/sh -xc "$MACOS_CMD" =20 script: - docker run @@ -68,6 +56,22 @@ env: 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" + brew update && + brew install ccache rpcgen xz yajl && + ./autogen.sh --prefix=3D\$(pwd)/install-root && + make -j3 && + make -j3 install && + make -j3 dist || + ( + 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 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 20:31:21 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 1528386919826103.58992462500487; Thu, 7 Jun 2018 08:55:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB52A30832EA; Thu, 7 Jun 2018 15:55:17 +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 96CF9308BDA2; Thu, 7 Jun 2018 15:55:17 +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 0B170180BA80; Thu, 7 Jun 2018 15:55:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w57Fsqan018139 for ; Thu, 7 Jun 2018 11:54:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8340A201E903; Thu, 7 Jun 2018 15:54:52 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-79.brq.redhat.com [10.40.204.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 076AC201E8ED for ; Thu, 7 Jun 2018 15:54:51 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Jun 2018 17:54:43 +0200 Message-Id: <20180607155443.4295-5-abologna@redhat.com> In-Reply-To: <20180607155443.4295-1-abologna@redhat.com> References: <20180607155443.4295-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] travis: Rename DOCKER_CMD to LINUX_CMD 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: , MIME-Version: 1.0 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.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 07 Jun 2018 15:55:18 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The new name is arguably more informative, especially now that we have MACOS_CMD and knowing that MINGW_CMD will likely be introduced at some point. Signed-off-by: Andrea Bolognani --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec45d78303..0ae8b293b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: -e PACKAGES=3D"$PACKAGES" -e DISTCHECK_CONFIGURE_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" "$IMAGE" - /bin/sh -xc "$DOCKER_CMD" + /bin/sh -xc "$LINUX_CMD" =20 git: submodules: true @@ -42,7 +42,7 @@ git: env: global: - VIR_TEST_DEBUG=3D1 - - DOCKER_CMD=3D" + - LINUX_CMD=3D" apt-get update && apt-get install -y \$PACKAGES && ./autogen.sh && --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list