From patchwork Tue Feb 9 12:36:46 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: 61525 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2017664lbl; Tue, 9 Feb 2016 04:40:02 -0800 (PST) X-Received: by 10.55.77.216 with SMTP id a207mr40879982qkb.80.1455021600802; Tue, 09 Feb 2016 04:40:00 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w189si35496369qhc.2.2016.02.09.04.40.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 09 Feb 2016 04:40:00 -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]:55312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7aK-0005b1-Ai for patch@linaro.org; Tue, 09 Feb 2016 07:40:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7XV-0000rV-PA for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT7XS-0001tU-Qr for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:37:05 -0500 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:33619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7XS-0001sV-HK for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:37:02 -0500 Received: by mail-wm0-x22f.google.com with SMTP id g62so172711887wme.0 for ; Tue, 09 Feb 2016 04:37:02 -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:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=wlsuj4/AhKXxiqcwcnLlzCMK3keTwWJmWz13ez1CIpM=; b=Chi2XIDj4ttQsTwxhxtxpIGVC8naQOXuKe/udZwUyTmbUiqJnV3P0VObr+w9/6r2Ci 6FsF8gng1hO3+sGtzvTdfKjMfVfUEJXgY41RgosVlsGohriECpjKM9QNm06JUWWJqHI+ mohlItRy0eqEuToxN0vtoArfsTDISb3RI/RTs= 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:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=wlsuj4/AhKXxiqcwcnLlzCMK3keTwWJmWz13ez1CIpM=; b=l+1ZqN2huymJrgQW2Ztoow6SfrC+d/mB8RKAbrUuAjIXc6oVssaz68YR/oeCtjOcHr J0c2UhdXnY5WbG1aCrcObk/Kmycnex3OEHldFmelmSRVTDp9GAY1cfaRFIE0JUY2OYTb JjoSI7s3SIEzL5j+QBfPjQG4NVF2b0VCm0km/fRrdFAYN2nJn1NDJEWm1l6opmo1EM5S UQ8xD1fECopmcpdbAQ2dHcQepuQ3aC65P/E0/MxBTxXe64NZ13PLippcUqxu4odMht3r CkMU02ipEw33lUmd1fNSbmgF7PNGlxUIZsQbi+zVM19nfEWxXYk0Hb/HFMisuSYz3ZK4 PAXg== X-Gm-Message-State: AG10YOSwEEvNT78VroHSFWj1jYTLFiap5RR5FhXkdk+ZQnKy5KaTJzbUo/lXAzjhTxvs9xDs X-Received: by 10.194.118.138 with SMTP id km10mr37158591wjb.57.1455021421905; Tue, 09 Feb 2016 04:37:01 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c7sm17346981wmd.13.2016.02.09.04.36.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 04:36:58 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C046B3E0593; Tue, 9 Feb 2016 12:36:57 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 9 Feb 2016 12:36:46 +0000 Message-Id: <1455021411-11817-2-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455021411-11817-1-git-send-email-alex.bennee@linaro.org> References: <1455021411-11817-1-git-send-email-alex.bennee@linaro.org> 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::22f Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 1/6] .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 Tested-by: David Gibson Reviewed-by: David Gibson --- .travis.yml | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) -- 2.7.0 diff --git a/.travis.yml b/.travis.yml index 0428aed..1a7db11 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