* [Qemu-devel] [PATCH v4 0/6] Travis updates
@ 2016-02-02 17:34 Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 1/6] .travis.yml: migrate to container builds Alex Bennée
` (5 more replies)
0 siblings, 6 replies; 13+ messages in thread
From: Alex Bennée @ 2016-02-02 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, pbonzini, Alex Bennée, david
Hi,
Here is v4 of the Travis updates. The first patch remains reviewed and
signed off but following feedback on the others I've tried harder to
reduce the load on the Travis build farm after defaulting "make
check". This breaks down into two things:
- enabling ccache
- reducing the build matrix
Estimating the effect is tricky due to the elastic nature of the
Travis cloud (for example the VM based builds are currently very slow
due to a series of merges in one day). However it looks to be having a
positive effect. I hope the ccache changes will be especially
noticeable once merged with master as the caches are per-branch.
Finally I've put myself down as maintainer after Peter's suggestion.
I'll put together a pull request with any patches that have reviews
from other people in the next few days and see how that works ;-)
Alex Bennée (6):
.travis.yml: migrate to container builds
.travis.yml: run make check for all matrix targets
.travis.yml: enable each of the co-routine backends
.travis.yml: enable ccache for the builds
.travis.yml: reduce the test matrix a little
MAINTAINERS: Add .travis.yml
.travis.yml | 109 +++++++++++++++++++++++++++++++++++++-----------------------
MAINTAINERS | 5 +++
2 files changed, 73 insertions(+), 41 deletions(-)
--
2.7.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v4 1/6] .travis.yml: migrate to container builds
2016-02-02 17:34 [Qemu-devel] [PATCH v4 0/6] Travis updates Alex Bennée
@ 2016-02-02 17:34 ` Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 2/6] .travis.yml: run make check for all matrix targets Alex Bennée
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2016-02-02 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, pbonzini, Alex Bennée, david
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 <alex.bennee@linaro.org>
Tested-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
--
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
v3
- Add Dave's t-b and rb tags
---
.travis.yml | 44 ++++++++++++++++++++++++++++++++------------
1 file changed, 32 insertions(+), 12 deletions(-)
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
--
2.7.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v4 2/6] .travis.yml: run make check for all matrix targets
2016-02-02 17:34 [Qemu-devel] [PATCH v4 0/6] Travis updates Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 1/6] .travis.yml: migrate to container builds Alex Bennée
@ 2016-02-02 17:34 ` Alex Bennée
2016-02-03 5:57 ` David Gibson
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 3/6] .travis.yml: enable each of the co-routine backends Alex Bennée
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Alex Bennée @ 2016-02-02 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, pbonzini, Alex Bennée, david
We only ran make check once before it used to be an unreliable target.
It was only a stop gap measure and we should be able to revert it now.
This also stops us needing a large all-MMU build.
We disable "make check" for a couple of the extra config targets which
are currently broken.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.travis.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4a0c23a..16be23f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ notifications:
on_failure: always
env:
global:
- - TEST_CMD=""
+ - TEST_CMD="make check"
- EXTRA_CONFIG=""
matrix:
# Group major targets together with their linux-user counterparts
@@ -73,17 +73,14 @@ script:
matrix:
# We manually include a number of additional build for non-standard bits
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,lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
- TEST_CMD="make check"
- compiler: gcc
# Debug related options
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-debug"
compiler: gcc
+ # We currently disable "make check"
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter"
+ TEST_CMD=""
compiler: gcc
# Disable a few of the optional features
- env: TARGETS=i386-softmmu,x86_64-softmmu
@@ -104,11 +101,15 @@ matrix:
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=simple"
compiler: gcc
+ # We currently disable "make check"
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=ftrace"
+ TEST_CMD=""
compiler: gcc
+ # We currently disable "make check"
- env: TARGETS=i386-softmmu,x86_64-softmmu
- EXTRA_CONFIG="--enable-trace-backends=ust"
+ EXTRA_CONFIG="--enable-trace-backends=ust"
+ TEST_CMD=""
compiler: gcc
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-modules"
--
2.7.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v4 3/6] .travis.yml: enable each of the co-routine backends
2016-02-02 17:34 [Qemu-devel] [PATCH v4 0/6] Travis updates Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 1/6] .travis.yml: migrate to container builds Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 2/6] .travis.yml: run make check for all matrix targets Alex Bennée
@ 2016-02-02 17:34 ` Alex Bennée
2016-02-03 5:58 ` David Gibson
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 4/6] .travis.yml: enable ccache for the builds Alex Bennée
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Alex Bennée @ 2016-02-02 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, pbonzini, Alex Bennée, david
We disable "make check" for the gthread backend as it is broken.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.travis.yml | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 16be23f..021eec7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,6 +94,10 @@ matrix:
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-sparse"
compiler: gcc
+ # Modules
+ - env: TARGETS=i386-softmmu,x86_64-softmmu
+ EXTRA_CONFIG="--enable-modules"
+ compiler: gcc
# All the trace backends (apart from dtrace)
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=stderr"
@@ -111,6 +115,15 @@ matrix:
EXTRA_CONFIG="--enable-trace-backends=ust"
TEST_CMD=""
compiler: gcc
+ # All the co-routine backends (apart from windows)
+ # We currently disable "make check"
- env: TARGETS=i386-softmmu,x86_64-softmmu
- EXTRA_CONFIG="--enable-modules"
+ EXTRA_CONFIG="--with-coroutine=gthread"
+ TEST_CMD=""
+ compiler: gcc
+ - env: TARGETS=i386-softmmu,x86_64-softmmu
+ EXTRA_CONFIG="--with-coroutine=ucontext"
+ compiler: gcc
+ - env: TARGETS=i386-softmmu,x86_64-softmmu
+ EXTRA_CONFIG="--with-coroutine=sigaltstack"
compiler: gcc
--
2.7.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v4 4/6] .travis.yml: enable ccache for the builds
2016-02-02 17:34 [Qemu-devel] [PATCH v4 0/6] Travis updates Alex Bennée
` (2 preceding siblings ...)
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 3/6] .travis.yml: enable each of the co-routine backends Alex Bennée
@ 2016-02-02 17:34 ` Alex Bennée
2016-02-03 5:59 ` David Gibson
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 5/6] .travis.yml: reduce the test matrix a little Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
5 siblings, 1 reply; 13+ messages in thread
From: Alex Bennée @ 2016-02-02 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, pbonzini, Alex Bennée, david
Travis support ccache on a cache-per-branch basis. Given not much of the
build changes between pushes as well as the duplication in each build it
seems worthwhile enabling this.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index 021eec7..4f09909 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
compiler:
- gcc
- clang
+cache: ccache
addons:
apt:
packages:
--
2.7.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v4 5/6] .travis.yml: reduce the test matrix a little
2016-02-02 17:34 [Qemu-devel] [PATCH v4 0/6] Travis updates Alex Bennée
` (3 preceding siblings ...)
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 4/6] .travis.yml: enable ccache for the builds Alex Bennée
@ 2016-02-02 17:34 ` Alex Bennée
2016-02-03 6:00 ` David Gibson
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
5 siblings, 1 reply; 13+ messages in thread
From: Alex Bennée @ 2016-02-02 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, pbonzini, Alex Bennée, david
As we are now running "make check" on more of the matrix it is worth
making more of an effort to reduce the overall load on Travis. I've done
a few things:
- Combining a number of the targets
- Building one target for each ancillary build
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.travis.yml | 42 +++++++++++++++++-------------------------
1 file changed, 17 insertions(+), 25 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4f09909..3b8046b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,20 +45,12 @@ env:
- EXTRA_CONFIG=""
matrix:
# Group major targets together with their linux-user counterparts
- - TARGETS=alpha-softmmu,alpha-linux-user
+ - TARGETS=alpha-softmmu,alpha-linux-user,cris-softmmu,cris-linux-user,m68k-softmmu,m68k-linux-user,microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user
- TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user
- - TARGETS=cris-softmmu,cris-linux-user
- TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user
- - TARGETS=m68k-softmmu,m68k-linux-user
- - TARGETS=microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user
- - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu
- - TARGETS=mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user
- - TARGETS=or32-softmmu,or32-linux-user
- - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user
- - TARGETS=s390x-softmmu,s390x-linux-user
- - TARGETS=sh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user
- - TARGETS=sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user
- - TARGETS=unicore32-softmmu,unicore32-linux-user
+ - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user
+ - TARGETS=or32-softmmu,or32-linux-user,ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user
+ - TARGETS=s390x-softmmu,s390x-linux-user,sh4-softmmu,sh4eb-softmmu,sh4-linux-user,sh4eb-linux-user,sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user,unicore32-softmmu,unicore32-linux-user
# Group remaining softmmu only targets into one build
- TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
git:
@@ -75,56 +67,56 @@ matrix:
# We manually include a number of additional build for non-standard bits
include:
# Debug related options
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--enable-debug"
compiler: gcc
# We currently disable "make check"
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=alpha-softmmu
EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter"
TEST_CMD=""
compiler: gcc
# Disable a few of the optional features
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
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
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie"
compiler: gcc
# Sparse
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--enable-sparse"
compiler: gcc
# Modules
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=arm-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-modules"
compiler: gcc
# All the trace backends (apart from dtrace)
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=stderr"
compiler: gcc
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=simple"
compiler: gcc
# We currently disable "make check"
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=ftrace"
TEST_CMD=""
compiler: gcc
# We currently disable "make check"
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=ust"
TEST_CMD=""
compiler: gcc
# All the co-routine backends (apart from windows)
# We currently disable "make check"
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--with-coroutine=gthread"
TEST_CMD=""
compiler: gcc
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--with-coroutine=ucontext"
compiler: gcc
- - env: TARGETS=i386-softmmu,x86_64-softmmu
+ - env: TARGETS=x86_64-softmmu
EXTRA_CONFIG="--with-coroutine=sigaltstack"
compiler: gcc
--
2.7.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v4 6/6] MAINTAINERS: Add .travis.yml
2016-02-02 17:34 [Qemu-devel] [PATCH v4 0/6] Travis updates Alex Bennée
` (4 preceding siblings ...)
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 5/6] .travis.yml: reduce the test matrix a little Alex Bennée
@ 2016-02-02 17:34 ` Alex Bennée
2016-02-03 6:01 ` David Gibson
5 siblings, 1 reply; 13+ messages in thread
From: Alex Bennée @ 2016-02-02 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, pbonzini, Alex Bennée, david
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
MAINTAINERS | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index b6ed87a..426a735 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1566,6 +1566,11 @@ L: qemu-block@nongnu.org
S: Supported
F: tests/image-fuzzer/
+Build and test automation
+M: Alex Bennée <alex.bennee@linaro.org>
+L: qemu-devel@nongnu.org
+S: Supported
+F: .travis.yml
Documentation
-------------
--
2.7.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v4 2/6] .travis.yml: run make check for all matrix targets
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 2/6] .travis.yml: run make check for all matrix targets Alex Bennée
@ 2016-02-03 5:57 ` David Gibson
0 siblings, 0 replies; 13+ messages in thread
From: David Gibson @ 2016-02-03 5:57 UTC (permalink / raw)
To: Alex Bennée; +Cc: kwolf, pbonzini, qemu-devel, stefanha, peter.maydell
[-- Attachment #1: Type: text/plain, Size: 3109 bytes --]
On Tue, Feb 02, 2016 at 05:34:04PM +0000, Alex Bennée wrote:
> We only ran make check once before it used to be an unreliable target.
> It was only a stop gap measure and we should be able to revert it now.
> This also stops us needing a large all-MMU build.
>
> We disable "make check" for a couple of the extra config targets which
> are currently broken.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Tested-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> .travis.yml | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 4a0c23a..16be23f 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -40,7 +40,7 @@ notifications:
> on_failure: always
> env:
> global:
> - - TEST_CMD=""
> + - TEST_CMD="make check"
> - EXTRA_CONFIG=""
> matrix:
> # Group major targets together with their linux-user counterparts
> @@ -73,17 +73,14 @@ script:
> matrix:
> # We manually include a number of additional build for non-standard bits
> 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,lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
> - TEST_CMD="make check"
> - compiler: gcc
> # Debug related options
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-debug"
> compiler: gcc
> + # We currently disable "make check"
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter"
> + TEST_CMD=""
> compiler: gcc
> # Disable a few of the optional features
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> @@ -104,11 +101,15 @@ matrix:
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-trace-backends=simple"
> compiler: gcc
> + # We currently disable "make check"
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-trace-backends=ftrace"
> + TEST_CMD=""
> compiler: gcc
> + # We currently disable "make check"
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> - EXTRA_CONFIG="--enable-trace-backends=ust"
> + EXTRA_CONFIG="--enable-trace-backends=ust"
> + TEST_CMD=""
> compiler: gcc
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-modules"
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v4 3/6] .travis.yml: enable each of the co-routine backends
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 3/6] .travis.yml: enable each of the co-routine backends Alex Bennée
@ 2016-02-03 5:58 ` David Gibson
0 siblings, 0 replies; 13+ messages in thread
From: David Gibson @ 2016-02-03 5:58 UTC (permalink / raw)
To: Alex Bennée; +Cc: kwolf, pbonzini, qemu-devel, stefanha, peter.maydell
[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]
On Tue, Feb 02, 2016 at 05:34:05PM +0000, Alex Bennée wrote:
> We disable "make check" for the gthread backend as it is broken.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Tested-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> .travis.yml | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 16be23f..021eec7 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -94,6 +94,10 @@ matrix:
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-sparse"
> compiler: gcc
> + # Modules
> + - env: TARGETS=i386-softmmu,x86_64-softmmu
> + EXTRA_CONFIG="--enable-modules"
> + compiler: gcc
> # All the trace backends (apart from dtrace)
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-trace-backends=stderr"
> @@ -111,6 +115,15 @@ matrix:
> EXTRA_CONFIG="--enable-trace-backends=ust"
> TEST_CMD=""
> compiler: gcc
> + # All the co-routine backends (apart from windows)
> + # We currently disable "make check"
> - env: TARGETS=i386-softmmu,x86_64-softmmu
> - EXTRA_CONFIG="--enable-modules"
> + EXTRA_CONFIG="--with-coroutine=gthread"
> + TEST_CMD=""
> + compiler: gcc
> + - env: TARGETS=i386-softmmu,x86_64-softmmu
> + EXTRA_CONFIG="--with-coroutine=ucontext"
> + compiler: gcc
> + - env: TARGETS=i386-softmmu,x86_64-softmmu
> + EXTRA_CONFIG="--with-coroutine=sigaltstack"
> compiler: gcc
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v4 4/6] .travis.yml: enable ccache for the builds
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 4/6] .travis.yml: enable ccache for the builds Alex Bennée
@ 2016-02-03 5:59 ` David Gibson
2016-02-04 15:09 ` Alex Bennée
0 siblings, 1 reply; 13+ messages in thread
From: David Gibson @ 2016-02-03 5:59 UTC (permalink / raw)
To: Alex Bennée; +Cc: kwolf, pbonzini, qemu-devel, stefanha, peter.maydell
[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]
On Tue, Feb 02, 2016 at 05:34:06PM +0000, Alex Bennée wrote:
> Travis support ccache on a cache-per-branch basis. Given not much of the
> build changes between pushes as well as the duplication in each build it
> seems worthwhile enabling this.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Tested-by: David Gibson <david@gibson.dropbear.id.au>
From the build times, it doesn't look like this is buying us as much
as I might have hoped, still it's unlikely to hurt.
Do we know what the lifetime for the cache travis imposes?
> ---
> .travis.yml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/.travis.yml b/.travis.yml
> index 021eec7..4f09909 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -5,6 +5,7 @@ python:
> compiler:
> - gcc
> - clang
> +cache: ccache
> addons:
> apt:
> packages:
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v4 5/6] .travis.yml: reduce the test matrix a little
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 5/6] .travis.yml: reduce the test matrix a little Alex Bennée
@ 2016-02-03 6:00 ` David Gibson
0 siblings, 0 replies; 13+ messages in thread
From: David Gibson @ 2016-02-03 6:00 UTC (permalink / raw)
To: Alex Bennée; +Cc: kwolf, pbonzini, qemu-devel, stefanha, peter.maydell
[-- Attachment #1: Type: text/plain, Size: 6254 bytes --]
On Tue, Feb 02, 2016 at 05:34:07PM +0000, Alex Bennée wrote:
> As we are now running "make check" on more of the matrix it is worth
> making more of an effort to reduce the overall load on Travis. I've done
> a few things:
>
> - Combining a number of the targets
> - Building one target for each ancillary build
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Tested-by: David Gibson <david@gibson.dropbear.id.au>
I'm still in favour of collapsing the matrix even more, but I
certainly won't object to this partial step for the time being.
> ---
> .travis.yml | 42 +++++++++++++++++-------------------------
> 1 file changed, 17 insertions(+), 25 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 4f09909..3b8046b 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -45,20 +45,12 @@ env:
> - EXTRA_CONFIG=""
> matrix:
> # Group major targets together with their linux-user counterparts
> - - TARGETS=alpha-softmmu,alpha-linux-user
> + - TARGETS=alpha-softmmu,alpha-linux-user,cris-softmmu,cris-linux-user,m68k-softmmu,m68k-linux-user,microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user
> - TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user
> - - TARGETS=cris-softmmu,cris-linux-user
> - TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user
> - - TARGETS=m68k-softmmu,m68k-linux-user
> - - TARGETS=microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user
> - - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu
> - - TARGETS=mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user
> - - TARGETS=or32-softmmu,or32-linux-user
> - - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user
> - - TARGETS=s390x-softmmu,s390x-linux-user
> - - TARGETS=sh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user
> - - TARGETS=sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user
> - - TARGETS=unicore32-softmmu,unicore32-linux-user
> + - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user
> + - TARGETS=or32-softmmu,or32-linux-user,ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user
> + - TARGETS=s390x-softmmu,s390x-linux-user,sh4-softmmu,sh4eb-softmmu,sh4-linux-user,sh4eb-linux-user,sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user,unicore32-softmmu,unicore32-linux-user
> # Group remaining softmmu only targets into one build
> - TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
> git:
> @@ -75,56 +67,56 @@ matrix:
> # We manually include a number of additional build for non-standard bits
> include:
> # Debug related options
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--enable-debug"
> compiler: gcc
> # We currently disable "make check"
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=alpha-softmmu
> EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter"
> TEST_CMD=""
> compiler: gcc
> # Disable a few of the optional features
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> 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
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie"
> compiler: gcc
> # Sparse
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--enable-sparse"
> compiler: gcc
> # Modules
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=arm-softmmu,x86_64-softmmu
> EXTRA_CONFIG="--enable-modules"
> compiler: gcc
> # All the trace backends (apart from dtrace)
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--enable-trace-backends=stderr"
> compiler: gcc
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--enable-trace-backends=simple"
> compiler: gcc
> # We currently disable "make check"
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--enable-trace-backends=ftrace"
> TEST_CMD=""
> compiler: gcc
> # We currently disable "make check"
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--enable-trace-backends=ust"
> TEST_CMD=""
> compiler: gcc
> # All the co-routine backends (apart from windows)
> # We currently disable "make check"
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--with-coroutine=gthread"
> TEST_CMD=""
> compiler: gcc
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--with-coroutine=ucontext"
> compiler: gcc
> - - env: TARGETS=i386-softmmu,x86_64-softmmu
> + - env: TARGETS=x86_64-softmmu
> EXTRA_CONFIG="--with-coroutine=sigaltstack"
> compiler: gcc
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v4 6/6] MAINTAINERS: Add .travis.yml
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
@ 2016-02-03 6:01 ` David Gibson
0 siblings, 0 replies; 13+ messages in thread
From: David Gibson @ 2016-02-03 6:01 UTC (permalink / raw)
To: Alex Bennée; +Cc: kwolf, pbonzini, qemu-devel, stefanha, peter.maydell
[-- Attachment #1: Type: text/plain, Size: 844 bytes --]
On Tue, Feb 02, 2016 at 05:34:08PM +0000, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> MAINTAINERS | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b6ed87a..426a735 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1566,6 +1566,11 @@ L: qemu-block@nongnu.org
> S: Supported
> F: tests/image-fuzzer/
>
> +Build and test automation
> +M: Alex Bennée <alex.bennee@linaro.org>
> +L: qemu-devel@nongnu.org
> +S: Supported
> +F: .travis.yml
>
> Documentation
> -------------
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v4 4/6] .travis.yml: enable ccache for the builds
2016-02-03 5:59 ` David Gibson
@ 2016-02-04 15:09 ` Alex Bennée
0 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2016-02-04 15:09 UTC (permalink / raw)
To: David Gibson; +Cc: kwolf, pbonzini, qemu-devel, stefanha, peter.maydell
David Gibson <david@gibson.dropbear.id.au> writes:
> On Tue, Feb 02, 2016 at 05:34:06PM +0000, Alex Bennée wrote:
>> Travis support ccache on a cache-per-branch basis. Given not much of the
>> build changes between pushes as well as the duplication in each build it
>> seems worthwhile enabling this.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> Tested-by: David Gibson <david@gibson.dropbear.id.au>
>
> From the build times, it doesn't look like this is buying us as much
> as I might have hoped, still it's unlikely to hurt.
>
> Do we know what the lifetime for the cache travis imposes?
AFAICT they last forever unless the user wipes the cache. They may have a
hidden heuristic to stop them growing too big but I don't know.
>
>> ---
>> .travis.yml | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/.travis.yml b/.travis.yml
>> index 021eec7..4f09909 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -5,6 +5,7 @@ python:
>> compiler:
>> - gcc
>> - clang
>> +cache: ccache
>> addons:
>> apt:
>> packages:
--
Alex Bennée
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2016-02-04 15:09 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-02 17:34 [Qemu-devel] [PATCH v4 0/6] Travis updates Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 1/6] .travis.yml: migrate to container builds Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 2/6] .travis.yml: run make check for all matrix targets Alex Bennée
2016-02-03 5:57 ` David Gibson
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 3/6] .travis.yml: enable each of the co-routine backends Alex Bennée
2016-02-03 5:58 ` David Gibson
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 4/6] .travis.yml: enable ccache for the builds Alex Bennée
2016-02-03 5:59 ` David Gibson
2016-02-04 15:09 ` Alex Bennée
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 5/6] .travis.yml: reduce the test matrix a little Alex Bennée
2016-02-03 6:00 ` David Gibson
2016-02-02 17:34 ` [Qemu-devel] [PATCH v4 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
2016-02-03 6:01 ` David Gibson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).