From nobody Wed Nov 27 06:47:59 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 15537066548711003.154947306851; Wed, 27 Mar 2019 10:10:54 -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 8551B89C45; Wed, 27 Mar 2019 17:10:53 +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 0D9121001DE2; Wed, 27 Mar 2019 17:10:53 +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 C67BF180338B; Wed, 27 Mar 2019 17:10:52 +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 x2RHAirN013334 for ; Wed, 27 Mar 2019 13:10:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E3FE1001E84; Wed, 27 Mar 2019 17:10:44 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FEB81001DF3; Wed, 27 Mar 2019 17:10:42 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 27 Mar 2019 17:10:33 +0000 Message-Id: <20190327171038.24095-2-berrange@redhat.com> In-Reply-To: <20190327171038.24095-1-berrange@redhat.com> References: <20190327171038.24095-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 v3 1/6] tests: don't abort in fopen(/proc/mounts) 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.27]); Wed, 27 Mar 2019 17:10:54 +0000 (UTC) The mock fopen() function will abort if "/proc/mounts" is requested with "r" permissions and VIR_CGROUP_MOCK_FILENAME env var is not set. Unfortunately this is triggering by the libselinux library constructor when it tries to read /proc/mounts to find out if selinuxfs is mounted in an unusual place. This, however, only affects libselinux in Debian as that opens with "r", while in Fedora / RHEL it opens "re" and thus luckily never triggered the abort(), instead getting an EACCESS. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/vircgroupmock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 06bd0a5f29..9c67a44b0d 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -460,8 +460,10 @@ FILE *fopen(const char *path, const char *mode) } =20 if (type) { - if (!filename) - abort(); + if (!filename) { + errno =3D EACCES; + return NULL; + } if (virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", abs_srcdir, filename, type) < 0) { abort(); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed Nov 27 06:47:59 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 155370665080385.36677898180164; Wed, 27 Mar 2019 10:10:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6FD2E72665; Wed, 27 Mar 2019 17:10:49 +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 4371E62660; Wed, 27 Mar 2019 17:10:49 +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 E74AC3D387; Wed, 27 Mar 2019 17:10:48 +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 x2RHAjcX013344 for ; Wed, 27 Mar 2019 13:10:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id E7C211001DD4; Wed, 27 Mar 2019 17:10:45 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id B02661001E84; Wed, 27 Mar 2019 17:10:44 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 27 Mar 2019 17:10:34 +0000 Message-Id: <20190327171038.24095-3-berrange@redhat.com> In-Reply-To: <20190327171038.24095-1-berrange@redhat.com> References: <20190327171038.24095-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 v3 2/6] tests: add targets for building libvirt inside docker containers 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 27 Mar 2019 17:10:50 +0000 (UTC) The Travis CI system uses docker containers for its build environment. These are pre-built and hosted under quay.io/libvirt so that developers can use them for reproducing problems locally. Getting the right docker command syntax to use them, however, is not entirely easy. This patch addresses that usability issue by introducing some make targets. To run a simple build (aka 'make all') using the Fedora 28 container: make ci-build@fedora-28 To also run unit tests make ci-check@fedora-28 This is just syntax sugar for calling the previous command with a custom make target make ci-build@fedora-28 MAKE_ARGS=3D"check" To do a purely interactive build it is possible to request a shell make ci-shell@fedora-28 To do a mingw build, it is currently possible to use the fedora-rawhide and request a different configure script make ci-build@fedora-rawhide CONFIGURE=3Dmingw32-configure It is also possible to do cross compiled builds via the Debian containers make ci-build@debian-9-cross-s390x In all cases the GIT source tree is cloned locally into a 'ci-tree/src' sub-directory which is then exposed to the container at '/src'. It is setup to facilitate VPATH build so the initial working directory is '/src/build'. An in source tree build can be requested instead by passing an empty string VPATH=3D arg to make. The make rules are kept in a standalone file that is included into the main Makefile.am, so that it is possible to run them without having to invoke autotools first. It is neccessary to disable the gnulib submodule commit check because this fails due to the way we have manually cloned submodule repos as primary git repos with their own .git directory, instead of letting git treat them as submodules in the top level .git directory. make[1]: Entering directory '/src/build' fatal: Not a valid object name origin fatal: run_command returned non-zero status for .gnulib . maint.mk: found non-public submodule commit make: *** [/src/maint.mk:1448: public-submodule-commit] Error 1 Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitignore | 1 + Makefile.am | 2 + Makefile.ci | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+) create mode 100644 Makefile.ci diff --git a/.gitignore b/.gitignore index 3223cf1b76..a67a842294 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ /autom4te.cache /build-aux/* /build/ +/ci-tree/ /confdefs.h /config.cache /config.guess diff --git a/Makefile.am b/Makefile.am index 3c06e2619a..8add2f5d61 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,3 +109,5 @@ gen-AUTHORS: mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \ rm -f all.list maint.list contrib.list; \ fi + +include Makefile.ci diff --git a/Makefile.ci b/Makefile.ci new file mode 100644 index 0000000000..5448fedd97 --- /dev/null +++ b/Makefile.ci @@ -0,0 +1,206 @@ +# -*- makefile -*- +# vim: filetype=3Dmake + +HERE =3D $(shell pwd) + +# Figure out name and path to this file. This isn't +# portable but we only care for modern GNU make +THIS_FILE =3D $(abspath $(lastword $(MAKEFILE_LIST))) + +# The directory holding content on the host that we will +# expose to the container. +SCRATCHDIR =3D $(HERE)/ci-tree + +TOP =3D $(shell git rev-parse --show-toplevel) + +# The directory holding the clo%%%%ne of the git repo that +# we will expose to the container +HOST_SRCDIR =3D $(SCRATCHDIR)/src + +# The directory holding the source inside the +# container. ie where we told docker to expose +# the $GIT/ci-tree directory from the host +CONT_SRCDIR =3D /src + +# Relative directory to perform the build in. This +# defaults to using a separate build dir, but can be +# set to empty string for an in-source tree build. +CONT_VPATH =3D build + +# The directory holding the build output inside the +# container. +CONT_BUILDDIR =3D $(CONT_SRCDIR)/$(CONT_VPATH) + +# Can be overridden with mingw{32,64}-configure if desired +CONFIGURE =3D $(CONT_SRCDIR)/configure + +# Default to using all possible CPUs +SMP =3D $(shell getconf _NPROCESSORS_ONLN) + +# Any extra arguments to pass to make +MAKE_ARGS =3D + +# Any extra arguments to pass to configure +CONFIGURE_ARGS =3D + +# Avoid pulling submodules over the network by locally +# cloning them +SUBMODULES =3D .gnulib src/keycodemapdb + +IMAGE_PREFIX =3D quay.io/libvirt/buildenv- +IMAGE_TAG =3D :master + +# We delete the virtual root after completion, set +# to 0 if you need to keep it around for debugging +CLEAN =3D 1 + +# We'll always freshly clone the virtual root each +# time in case it was not cleaned up before. Set +# to 1 if you want to try restarting a previously +# preserved env +REUSE =3D 0 + +# We need the container process to run with current host IDs +# so that it can access the passed in build directory +UID =3D $(shell id -u) +GID =3D $(shell id -g) + +# Docker doesn't require the IDs you run as to exist in +# the container's /etc/passwd & /etc/group files, but +# if they do not, then libvirt's 'make check' will fail +# many tests. +# +# We do not directly mount /etc/{passwd,group} as Docker +# is liable to mess with SELinux labelling which will +# then prevent the host accessing them. Copying them +# first is safer. +PWDB_MOUNTS =3D \ + --volume $(SCRATCHDIR)/group:/etc/group:ro,z \ + --volume $(SCRATCHDIR)/passwd:/etc/passwd:ro,z \ + $(NULL) + +# Docker containers can have very large ulimits +# for nofiles - as much as 1048576. This makes +# libvirt very slow at exec'ing programs. +ULIMIT_FILES =3D 1024 + +# Args to use when cloning a git repo. +# -c stop it complaining about checking out a random hash +# -q stop it displaying progress info for local clone +# --local ensure we don't actually copy files +GIT_ARGS =3D \ + -c advice.detachedHead=3Dfalse \ + -q \ + --local \ + $(NULL) + +# Args to use when running the docker env +# --rm stop inactive containers getting left behind +# --user we execute as the same user & group account +# as dev so that file ownership matches host +# instead of root:root +# --volume to pass in the cloned git repo & config +# --workdir to set cwd to vpath build location +# --ulimit lower files limit for performance reasons +# --interactive +# --tty Ensure we have ability to Ctrl-C the build +DOCKER_ARGS =3D \ + --rm \ + --user $(UID):$(GID) \ + --interactive \ + --tty \ + $(PWDB_MOUNTS) \ + --volume $(HOST_SRCDIR):$(CONT_SRCDIR):z \ + --workdir $(CONT_SRCDIR) \ + --ulimit nofile=3D$(ULIMIT_FILES):$(ULIMIT_FILES) \ + $(NULL) + +check-docker: + @echo -n "Checking if Docker is available and running..." && \ + docker version 1>/dev/null && echo "yes" + +prepare-tree: + @if test "$(REUSE)" !=3D "1" ; then \ + rm -rf ci-tree ; \ + fi + @if ! test -d ci-tree ; then \ + mkdir -p ci-tree/src; \ + cp /etc/passwd ci-tree; \ + cp /etc/group ci-tree; \ + echo "Cloning $(TOP) to $(HOST_SRCDIR)"; \ + git clone $(GIT_ARGS) $(TOP) $(HOST_SRCDIR) || exit 1; \ + for mod in $(SUBMODULES) ; \ + do \ + if test -d $(TOP)/$$mod ; \ + then \ + echo "Cloning $(TOP)/$$mod to $(HOST_SRCDIR)/$$mod"; \ + git clone $(GIT_ARGS) $(TOP)/$$mod $(HOST_SRCDIR)/$$mod || exit 1; \ + fi ; \ + done ; \ + else \ + test "$(CLEAN)" =3D "1" && rm -rf ci-tree || : ; \ + fi + +# $CONFIGURE_OPTS is a env that can optionally be set in the container, +# populated at build time from the Dockerfile. A typical use case would +# be to pass --host/--target args to trigger cross-compilation +# +# This can be augmented by make local args in $(CONFIGURE_ARGS) +ci-build@%: check-docker prepare-tree + docker run $(DOCKER_ARGS) $(IMAGE_PREFIX)$*$(IMAGE_TAG) \ + /bin/bash -c '\ + mkdir -p $(CONT_BUILDDIR) || exit 1 ; \ + cd $(CONT_BUILDDIR) ; \ + NOCONFIGURE=3D1 $(CONT_SRCDIR)/autogen.sh || exit 1 ; \ + $(CONFIGURE) $${CONFIGURE_OPTS} $(CONFIGURE_ARGS) ; \ + if test $$? !=3D 0 ; \ + then \ + test -f config.log && cat config.log ; \ + exit 1 ; \ + fi; \ + find -name test-suite.log -delete ; \ + make -j$(SMP) $(MAKE_ARGS) ; \ + if test $$? !=3D 0 ; then \ + LOGS=3D`find -name test-suite.log` ; \ + if test "$${LOGS}" !=3D "" ; then \ + echo "=3D=3D=3D LOG FILE(S) START =3D=3D=3D" ; \ + cat $${LOGS} ; \ + echo "=3D=3D=3D LOG FILE(S) END =3D=3D=3D" ; \ + fi ; \ + exit 1 ;\ + fi' + @test "$(CLEAN)" =3D "1" && rm -rf ci-tree || : + +ci-check@%: + $(MAKE) -f $(THIS_FILE) ci-build@$* MAKE_ARGS=3D"check gl_public_submodul= e_commit=3D" + +ci-shell@%: prepare-tree + docker run $(DOCKER_ARGS) $(IMAGE_PREFIX)$*$(IMAGE_TAG) /bin/bash + @test "$(CLEAN)" =3D "1" && rm -rf ci-tree || : + +ci-help: + @echo "Build libvirt inside docker containers used for CI" + @echo + @echo "Available targets:" + @echo + @echo " ci-build@\$$IMAGE - run a default 'make'" + @echo " ci-check@\$$IMAGE - run a 'make check'" + @echo " ci-shell@\$$IMAGE - run an interactive shell" + @echo + @echo "Available x86 container images:" + @echo + @echo " centos-7" + @echo " debian-8" + @echo " debian-9" + @echo " debian-sid" + @echo " fedora-28" + @echo " fedora-29" + @echo " fedora-rawhide" + @echo " ubuntu-16" + @echo " ubuntu-18" + @echo + @echo "Available make variables:" + @echo + @echo " CLEAN=3D0 - do not delete '$(SCRATCHDIR)' after completion" + @echo " REUSE=3D1 - re-use existing '$(SCRATCHDIR)' content" + @echo --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed Nov 27 06:47:59 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 1553706655734847.6656878981538; Wed, 27 Mar 2019 10:10:55 -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 118BA2D800; Wed, 27 Mar 2019 17:10:54 +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 D9D715D978; Wed, 27 Mar 2019 17:10:53 +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 97AA93D38C; Wed, 27 Mar 2019 17:10:53 +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 x2RHAljp013351 for ; Wed, 27 Mar 2019 13:10:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4F7601001DE2; Wed, 27 Mar 2019 17:10:47 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 609E91001DD4; Wed, 27 Mar 2019 17:10:46 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 27 Mar 2019 17:10:35 +0000 Message-Id: <20190327171038.24095-4-berrange@redhat.com> In-Reply-To: <20190327171038.24095-1-berrange@redhat.com> References: <20190327171038.24095-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 v3 3/6] 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.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.30]); Wed, 27 Mar 2019 17:10:54 +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 | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54de7dd7ad..6d04201e59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,24 +11,30 @@ matrix: - docker env: - IMAGE=3D"ubuntu-18" - - DOCKER_CMD=3D"$LINUX_CMD" + - MAKE_ARGS=3D"syntax-check distcheck" + script: + - make -f Makefile.ci ci-build@$IMAGE MAKE_ARGS=3D"$MAKE_ARGS" - services: - docker env: - IMAGE=3D"centos-7" - - DOCKER_CMD=3D"$LINUX_CMD" + - MAKE_ARGS=3D"syntax-check distcheck" + script: + - make -f Makefile.ci ci-build@$IMAGE MAKE_ARGS=3D"$MAKE_ARGS" - services: - docker env: - IMAGE=3D"fedora-rawhide" - MINGW=3D"mingw32" - - DOCKER_CMD=3D"$MINGW_CMD" + script: + - make -f Makefile.ci ci-build@$IMAGE CONFIGURE=3D$MINGW-configure - services: - docker env: - IMAGE=3D"fedora-rawhide" - MINGW=3D"mingw64" - - DOCKER_CMD=3D"$MINGW_CMD" + script: + - make -f Makefile.ci ci-build@$IMAGE CONFIGURE=3D$MINGW-configure - compiler: clang language: c os: osx @@ -37,43 +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" - "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 || - ( - 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 From nobody Wed Nov 27 06:47:59 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 1553706653760564.6020186915339; Wed, 27 Mar 2019 10:10:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5064689C44; Wed, 27 Mar 2019 17:10:52 +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 2CED13790; Wed, 27 Mar 2019 17:10:52 +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 E02131803387; Wed, 27 Mar 2019 17:10:51 +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 x2RHAmbY013356 for ; Wed, 27 Mar 2019 13:10:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7BF951001DE2; Wed, 27 Mar 2019 17:10:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8ABF1001DD4; Wed, 27 Mar 2019 17:10:47 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 27 Mar 2019 17:10:36 +0000 Message-Id: <20190327171038.24095-5-berrange@redhat.com> In-Reply-To: <20190327171038.24095-1-berrange@redhat.com> References: <20190327171038.24095-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 v3 4/6] travis: use declarative syntax for homebrew packages 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 27 Mar 2019 17:10:52 +0000 (UTC) Instead of running custom commands use the new declarative syntax for listing extra homebrew packages. Signed-off-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d04201e59..fe9bda82a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,14 @@ branches: except: - /^.*-maint$/ =20 +addons: + homebrew: + packages: + - ccache + - rpcgen + - xz + - yajl + matrix: include: - services: @@ -52,8 +60,6 @@ env: # 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 && --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed Nov 27 06:47:59 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 1553706658416209.69771300767593; Wed, 27 Mar 2019 10:10:58 -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 D61A43002C7F; Wed, 27 Mar 2019 17:10:56 +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 B06B25BBCE; Wed, 27 Mar 2019 17:10: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 729B5181A000; Wed, 27 Mar 2019 17:10:56 +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 x2RHAoEw013369 for ; Wed, 27 Mar 2019 13:10:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 169441001E62; Wed, 27 Mar 2019 17:10:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E4311001DE2; Wed, 27 Mar 2019 17:10:48 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 27 Mar 2019 17:10:37 +0000 Message-Id: <20190327171038.24095-6-berrange@redhat.com> In-Reply-To: <20190327171038.24095-1-berrange@redhat.com> References: <20190327171038.24095-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 v3 5/6] travis: remove display of test-suite.log from macOS 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.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.46]); Wed, 27 Mar 2019 17:10:57 +0000 (UTC) We are not running "make check" on macOS, so the commands to cat the test-suite.log are not useful. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Andrea Bolognani --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe9bda82a9..027fa0c67a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,14 +63,7 @@ env: ./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 - ) - " + make -j3 dist" =20 notifications: irc: --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed Nov 27 06:47:59 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 1553706657557623.0575329401662; Wed, 27 Mar 2019 10:10:57 -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 E27AC8667E; Wed, 27 Mar 2019 17:10:55 +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 B86CA5C5DF; Wed, 27 Mar 2019 17:10:55 +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 7833218033A2; Wed, 27 Mar 2019 17:10:55 +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 x2RHApd4013376 for ; Wed, 27 Mar 2019 13:10:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 51B431001E84; Wed, 27 Mar 2019 17:10:51 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8577C1001DE2; Wed, 27 Mar 2019 17:10:50 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 27 Mar 2019 17:10:38 +0000 Message-Id: <20190327171038.24095-7-berrange@redhat.com> In-Reply-To: <20190327171038.24095-1-berrange@redhat.com> References: <20190327171038.24095-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 v3 6/6] travis: put macOS script inline in the macOS matrix entry 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.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.26]); Wed, 27 Mar 2019 17:10:56 +0000 (UTC) Signed-off-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 027fa0c67a..af17dc6276 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,23 +48,15 @@ matrix: os: osx env: - PATH=3D"/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec= :/usr/local/opt/rpcgen/bin:$PATH" + - VIR_TEST_DEBUG=3D1 script: - /bin/sh -xc "$MACOS_CMD" + # We can't run 'distcheck' or 'syntax-check' because they fail on + # macOS, but doing 'install' and 'dist' gives us some useful cover= age + - ./autogen.sh --prefix=3D$(pwd)/install-root && make -j3 && make = -j3 install && make -j3 dist =20 git: submodules: true =20 -env: - global: - - VIR_TEST_DEBUG=3D1 - # 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" - ./autogen.sh --prefix=3D\$(pwd)/install-root && - make -j3 && - make -j3 install && - make -j3 dist" - notifications: irc: # The channel name "irc.oftc.net#virt" is encrypted against libvirt/li= bvirt --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list