From patchwork Thu Jan 21 22:28:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 60104 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp276245lbb; Thu, 21 Jan 2016 14:28:51 -0800 (PST) X-Received: by 10.140.169.9 with SMTP id p9mr40819231qhp.50.1453415331827; Thu, 21 Jan 2016 14:28:51 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m22si1722771qkh.18.2016.01.21.14.28.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jan 2016 14:28:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dkim=fail header.i=@linaro.org Received: from localhost ([::1]:49901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMNil-0007r0-9F for patch@linaro.org; Thu, 21 Jan 2016 17:28:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMNiL-0007ZN-Mb for qemu-devel@nongnu.org; Thu, 21 Jan 2016 17:28:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMNiI-0002Kp-Db for qemu-devel@nongnu.org; Thu, 21 Jan 2016 17:28:25 -0500 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:38710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMNiH-0002Ke-PE for qemu-devel@nongnu.org; Thu, 21 Jan 2016 17:28:22 -0500 Received: by mail-wm0-x22e.google.com with SMTP id b14so103867905wmb.1 for ; Thu, 21 Jan 2016 14:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=djk4x/9kNCQRNpU8W2/H7X+tEE1Hb8Tq0m8GjSFER1k=; b=DIw/V5vUdybfbx/cdYvWcicZzQsK57RLoqhfyLuhqMPsPen3FmSmNHlHbqVtrOBGS8 XurW9q8sxYRxjZp0Ef+S4MljvYIvhSon5QKIPsM9k8slgdGi0RDYPqaIkUsqDNF0n/TE /UfMgvA55WuhNyMW+74XtvoKaROeXfS7u9Gsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=djk4x/9kNCQRNpU8W2/H7X+tEE1Hb8Tq0m8GjSFER1k=; b=aWDzz5P02XZQduY6zwhV8V8UbR1fEkI3NCwplFp6Ra+0ujeZGzKhP+Y6UpEcdpXCbP ZKUd0YvIlG2b2XIeACrBrd7zmoXeyWyeN0SpJL2Hua4HVVNWunvUCDjCCGcXxyRsxy4J f2djTyYRF0EV5P5iLfXxWHTVhk+h/paICrVynBQMHDbLuIdPz+piKUBJBJMyR5Z5sYwD pP3a3r2sxBDND83oxZQsQxoYDw/J481LFApZqApekOUkpeqo6obugrNeqWRCKy4iwOVP CbOa0syM1v+re6CvulOusdi9yWtTWt60A28P9vMxobFLZRa8FXLcgzRkZseWbPceUOW/ UmIQ== X-Gm-Message-State: ALoCoQnAMUce6Py2bf11bf92tVorkZRbIRqWsBISTUnbEDYHAYhWD2DP11cwI8qSt0y3pOcp2DXR660HyIeEgCAkdJLNjFqN1w== X-Received: by 10.194.82.199 with SMTP id k7mr50908192wjy.65.1453415300421; Thu, 21 Jan 2016 14:28:20 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j3sm262809wmj.19.2016.01.21.14.28.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jan 2016 14:28:18 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 621413E0346; Thu, 21 Jan 2016 22:28:18 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 21 Jan 2016 22:28:05 +0000 Message-Id: <1453415285-25014-1-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.6.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22e Cc: pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v2] .travis.yml: migrate to container builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This moves the Travis tests from the legacy VM infrastructure (which only seems to run 5-6 jobs at once) to the new container based approach. The principle difference is there is no sudo in the containers so all packages are installed using the apt add-on. This means one of the build combinations can be dropped as it was only for checking the build with additional packages. Signed-off-by: Alex Bennée -- v2 - re-enabled the user-space-tracing build - disable optional extras (instead of having optional build) - remove stray linux-user target from make check target --- .travis.yml | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) -- 2.6.4 diff --git a/.travis.yml b/.travis.yml index 6ca0260..4a0c23a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,37 @@ +sudo: false language: c python: - "2.4" compiler: - gcc - clang +addons: + apt: + packages: + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libcap-ng-dev + - libgnutls-dev + - libgtk-3-dev + - libiscsi-dev + - liblttng-ust-dev + - libncurses5-dev + - libnss3-dev + - libpixman-1-dev + - libpng12-dev + - librados-dev + - libsdl1.2-dev + - libseccomp-dev + - libspice-protocol-dev + - libspice-server-dev + - libssh2-1-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvte-2.90-dev + - sparse + - uuid-dev + notifications: irc: channels: @@ -14,11 +42,6 @@ env: global: - TEST_CMD="" - EXTRA_CONFIG="" - # Development packages, EXTRA_PKGS saved for additional builds - - CORE_PKGS="libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev" - - NET_PKGS="libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev libspice-protocol-dev libnss3-dev" - - GUI_PKGS="libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev" - - EXTRA_PKGS="" matrix: # Group major targets together with their linux-user counterparts - TARGETS=alpha-softmmu,alpha-linux-user @@ -43,8 +66,6 @@ git: before_install: - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive - - sudo apt-get update -qq - - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS} ${EXTRA_PKGS} before_script: - ./configure --target-list=${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG} script: @@ -54,7 +75,7 @@ matrix: include: # Make check target (we only do this once) - env: - - TARGETS=alpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu,i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,unicore32-softmmu,unicore32-linux-user,lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu + - TARGETS=alpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu,i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,unicore32-softmmu,lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu TEST_CMD="make check" compiler: gcc # Debug related options @@ -64,16 +85,16 @@ matrix: - env: TARGETS=i386-softmmu,x86_64-softmmu EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter" compiler: gcc - # All the extra -dev packages + # Disable a few of the optional features - env: TARGETS=i386-softmmu,x86_64-softmmu - EXTRA_PKGS="libaio-dev libcap-ng-dev libattr1-dev libbrlapi-dev uuid-dev libusb-1.0.0-dev" + EXTRA_CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb" compiler: gcc # Currently configure doesn't force --disable-pie - env: TARGETS=i386-softmmu,x86_64-softmmu EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie" compiler: gcc + # Sparse - env: TARGETS=i386-softmmu,x86_64-softmmu - EXTRA_PKGS="sparse" EXTRA_CONFIG="--enable-sparse" compiler: gcc # All the trace backends (apart from dtrace) @@ -87,7 +108,6 @@ matrix: EXTRA_CONFIG="--enable-trace-backends=ftrace" compiler: gcc - env: TARGETS=i386-softmmu,x86_64-softmmu - EXTRA_PKGS="liblttng-ust-dev liburcu-dev" EXTRA_CONFIG="--enable-trace-backends=ust" compiler: gcc - env: TARGETS=i386-softmmu,x86_64-softmmu