* [Qemu-devel] [PULL 1/6] .travis.yml: migrate to container builds
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
@ 2016-02-04 17:11 ` Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 2/6] .travis.yml: run make check for all matrix targets Alex Bennée
` (5 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2016-02-04 17:11 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel
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] 16+ messages in thread* [Qemu-devel] [PULL 2/6] .travis.yml: run make check for all matrix targets
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 1/6] .travis.yml: migrate to container builds Alex Bennée
@ 2016-02-04 17:11 ` Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 3/6] .travis.yml: enable each of the co-routine backends Alex Bennée
` (4 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2016-02-04 17:11 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel
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>
---
pr: added r-b/t-b tags
---
.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] 16+ messages in thread* [Qemu-devel] [PULL 3/6] .travis.yml: enable each of the co-routine backends
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 1/6] .travis.yml: migrate to container builds Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 2/6] .travis.yml: run make check for all matrix targets Alex Bennée
@ 2016-02-04 17:11 ` Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 4/6] .travis.yml: enable ccache for the builds Alex Bennée
` (3 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2016-02-04 17:11 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel
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>
---
pr: added r-b, t-b tags
---
.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] 16+ messages in thread* [Qemu-devel] [PULL 4/6] .travis.yml: enable ccache for the builds
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
` (2 preceding siblings ...)
2016-02-04 17:11 ` [Qemu-devel] [PULL 3/6] .travis.yml: enable each of the co-routine backends Alex Bennée
@ 2016-02-04 17:11 ` Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 5/6] .travis.yml: reduce the test matrix a little Alex Bennée
` (2 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2016-02-04 17:11 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel
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>
---
pr: added r-b and t-b tags
---
.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] 16+ messages in thread* [Qemu-devel] [PULL 5/6] .travis.yml: reduce the test matrix a little
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
` (3 preceding siblings ...)
2016-02-04 17:11 ` [Qemu-devel] [PULL 4/6] .travis.yml: enable ccache for the builds Alex Bennée
@ 2016-02-04 17:11 ` Alex Bennée
2016-02-04 17:12 ` [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
2016-02-05 16:27 ` [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
6 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2016-02-04 17:11 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel
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>
---
pr: added r-b and t-b tags
---
.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] 16+ messages in thread* [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
` (4 preceding siblings ...)
2016-02-04 17:11 ` [Qemu-devel] [PULL 5/6] .travis.yml: reduce the test matrix a little Alex Bennée
@ 2016-02-04 17:12 ` Alex Bennée
2016-02-05 6:25 ` Fam Zheng
2016-02-05 16:27 ` [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
6 siblings, 1 reply; 16+ messages in thread
From: Alex Bennée @ 2016-02-04 17:12 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
---
pr: added r-b tags
---
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] 16+ messages in thread* Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml
2016-02-04 17:12 ` [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
@ 2016-02-05 6:25 ` Fam Zheng
2016-02-05 16:26 ` Alex Bennée
0 siblings, 1 reply; 16+ messages in thread
From: Fam Zheng @ 2016-02-05 6:25 UTC (permalink / raw)
To: Alex Bennée; +Cc: peter.maydell, qemu-devel
On Thu, 02/04 17:12, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
>
> ---
> pr: added r-b tags
> ---
> 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
Judging from the formatting, this section seems to fall in the "Block drivers"
category in the front. Maybe add a "---" line below the caption text,
Build and test automation
-------------------------
M: ...
?
Can be a separate patch, though.
Fam
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml
2016-02-05 6:25 ` Fam Zheng
@ 2016-02-05 16:26 ` Alex Bennée
2016-02-05 16:28 ` Peter Maydell
0 siblings, 1 reply; 16+ messages in thread
From: Alex Bennée @ 2016-02-05 16:26 UTC (permalink / raw)
To: Fam Zheng; +Cc: peter.maydell, qemu-devel
Fam Zheng <famz@redhat.com> writes:
> On Thu, 02/04 17:12, Alex Bennée wrote:
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
>>
>> ---
>> pr: added r-b tags
>> ---
>> 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
>
> Judging from the formatting, this section seems to fall in the "Block drivers"
> category in the front. Maybe add a "---" line below the caption text,
>
> Build and test automation
> -------------------------
> M: ...
> ?
>
> Can be a separate patch, though.
As I've already submitted the pull I'll clean it up on the next round.
>
> Fam
--
Alex Bennée
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml
2016-02-05 16:26 ` Alex Bennée
@ 2016-02-05 16:28 ` Peter Maydell
0 siblings, 0 replies; 16+ messages in thread
From: Peter Maydell @ 2016-02-05 16:28 UTC (permalink / raw)
To: Alex Bennée; +Cc: Fam Zheng, QEMU Developers
On 5 February 2016 at 16:26, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> Fam Zheng <famz@redhat.com> writes:
>> Can be a separate patch, though.
>
> As I've already submitted the pull I'll clean it up on the next round.
You told me this morning you were going to resubmit the pull
anyway, so you could fix it up if you wanted.
thanks
-- PMM
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Qemu-devel] [PULL 0/6] Travis updates
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
` (5 preceding siblings ...)
2016-02-04 17:12 ` [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
@ 2016-02-05 16:27 ` Alex Bennée
2016-02-05 16:32 ` Peter Maydell
6 siblings, 1 reply; 16+ messages in thread
From: Alex Bennée @ 2016-02-05 16:27 UTC (permalink / raw)
To: peter.maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Alex Bennée <alex.bennee@linaro.org> writes:
> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09ea8ec:
>
> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' into staging (2016-01-28 11:46:34 +0000)
>
> are available in the git repository at:
>
> https://github.com/stsquad/qemu.git tags/pull-build-test-20160204
I had a momentary panic when I saw the email messages still had ---
history on them but the tag is clean and can be pulled.
--
Alex Bennée
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [Qemu-devel] [PULL 0/6] Travis updates
2016-02-05 16:27 ` [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
@ 2016-02-05 16:32 ` Peter Maydell
2016-02-05 16:42 ` Alex Bennée
2016-02-05 17:28 ` Alex Bennée
0 siblings, 2 replies; 16+ messages in thread
From: Peter Maydell @ 2016-02-05 16:32 UTC (permalink / raw)
To: Alex Bennée; +Cc: QEMU Developers
On 5 February 2016 at 16:27, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> Alex Bennée <alex.bennee@linaro.org> writes:
>
>> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09ea8ec:
>>
>> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' into staging (2016-01-28 11:46:34 +0000)
>>
>> are available in the git repository at:
>>
>> https://github.com/stsquad/qemu.git tags/pull-build-test-20160204
>
> I had a momentary panic when I saw the email messages still had ---
> history on them but the tag is clean and can be pulled.
Merge conflict in .travis.yml -- probably easy enough to fix up but
since I don't know anything about the travis syntax or how to test it,
could you rebase and fix up the conflict, please?
thanks
-- PMM
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Qemu-devel] [PULL 0/6] Travis updates
2016-02-05 16:32 ` Peter Maydell
@ 2016-02-05 16:42 ` Alex Bennée
2016-02-05 17:28 ` Alex Bennée
1 sibling, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2016-02-05 16:42 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
Peter Maydell <peter.maydell@linaro.org> writes:
> On 5 February 2016 at 16:27, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> Alex Bennée <alex.bennee@linaro.org> writes:
>>
>>> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09ea8ec:
>>>
>>> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' into staging (2016-01-28 11:46:34 +0000)
>>>
>>> are available in the git repository at:
>>>
>>> https://github.com/stsquad/qemu.git tags/pull-build-test-20160204
>>
>> I had a momentary panic when I saw the email messages still had ---
>> history on them but the tag is clean and can be pulled.
>
> Merge conflict in .travis.yml -- probably easy enough to fix up but
> since I don't know anything about the travis syntax or how to test it,
> could you rebase and fix up the conflict, please?
Sneaky Paolo and Stefan getting their changes in before there is a
maintainer ;-)
I'll fix it up and address Fam's comment while I'm at it.
>
> thanks
> -- PMM
--
Alex Bennée
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Qemu-devel] [PULL 0/6] Travis updates
2016-02-05 16:32 ` Peter Maydell
2016-02-05 16:42 ` Alex Bennée
@ 2016-02-05 17:28 ` Alex Bennée
2016-02-05 20:19 ` Alex Bennée
1 sibling, 1 reply; 16+ messages in thread
From: Alex Bennée @ 2016-02-05 17:28 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Peter Maydell <peter.maydell@linaro.org> writes:
> On 5 February 2016 at 16:27, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> Alex Bennée <alex.bennee@linaro.org> writes:
>>
>>> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09ea8ec:
>>>
>>> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' into staging (2016-01-28 11:46:34 +0000)
>>>
>>> are available in the git repository at:
>>>
>>> https://github.com/stsquad/qemu.git tags/pull-build-test-20160204
>>
>> I had a momentary panic when I saw the email messages still had ---
>> history on them but the tag is clean and can be pulled.
>
> Merge conflict in .travis.yml -- probably easy enough to fix up but
> since I don't know anything about the travis syntax or how to test it,
> could you rebase and fix up the conflict, please?
I've pushed a signed tags/pull-build-test-20160205 but I'm still waiting
for the job to finish and I'm about to sign off. If your around for a
bit longer you can wait until:
https://travis-ci.org/stsquad/qemu/builds/107280297
goes green.
>
> thanks
> -- PMM
- --
Alex Bennée
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBAgAGBQJWtNvXAAoJEPvQ2wlanipEBesH/jKiJcv8qt+a4qJ8tq80UilF
rLbgOMnKxliUGQG7ITqOL2lIYrXex7J/6iO1/mdSPJ4GLy/6hoHzVzBdD0m/soV0
CwS3KSZiQLFc9M17WZ3NqpF/zGsKb0FNrr7zm1J72rgXtNmLiDLCpoVgJzfdxjtp
0KObW9OJSQ2AiG77G1awpdW6OEwn+YkOOtXpNYPFkpWouHr1Ryt99Sgpi6jnZmm1
0ksZwvyehIeR2+eqaFleSuafe9XWC5J+QRYixpINIsSVQOLLaRRBX5V+hbJORsDu
6D1t6NLLcZ7Lu/V7tG8HofNYDCGb+6mRbHTqJpmfxu4uP613LeSlAlws7Qqg5Yw=
=5f3f
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Qemu-devel] [PULL 0/6] Travis updates
2016-02-05 17:28 ` Alex Bennée
@ 2016-02-05 20:19 ` Alex Bennée
0 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2016-02-05 20:19 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
Alex Bennée <alex.bennee@linaro.org> writes:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
>
> Peter Maydell <peter.maydell@linaro.org> writes:
>
>> On 5 February 2016 at 16:27, Alex Bennée <alex.bennee@linaro.org> wrote:
>>>
>>> Alex Bennée <alex.bennee@linaro.org> writes:
>>>
>>>> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09ea8ec:
>>>>
>>>> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' into staging (2016-01-28 11:46:34 +0000)
>>>>
>>>> are available in the git repository at:
>>>>
>>>> https://github.com/stsquad/qemu.git tags/pull-build-test-20160204
>>>
>>> I had a momentary panic when I saw the email messages still had ---
>>> history on them but the tag is clean and can be pulled.
>>
>> Merge conflict in .travis.yml -- probably easy enough to fix up but
>> since I don't know anything about the travis syntax or how to test it,
>> could you rebase and fix up the conflict, please?
>
> I've pushed a signed tags/pull-build-test-20160205 but I'm still waiting
> for the job to finish and I'm about to sign off. If your around for a
> bit longer you can wait until:
>
> https://travis-ci.org/stsquad/qemu/builds/107280297
>
> goes green.
*sigh* - it looks like it failed. Try again next week :-/
>
>>
>> thanks
>> -- PMM
>
>
> - --
> Alex Bennée
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1
>
> iQEcBAEBAgAGBQJWtNvoAAoJEPvQ2wlanipE5VYH+wSubtKLq0VXlXLTHMz8oWKb
> r2fFF9XQgbYLtOlkUQ5qaGTQVSjJpwl8vOo8kyfEqJ1LvUoCpxYa14fV2F+rvIu+
> dAaxEl3QgFbOoq5eUymMBOTZaEfP0rXM/gk++a8082COFu68Vd0dV1pcHDlRwPp4
> 7AjglY9Bqx3WbIBoS8vuOfNJvzRCo/HAVw0zmlQSQMgTmx+zgeK43PzCCNTJVnA0
> YNNG46sRV+ZrdrlJ/FT7EJpPAaogINASCdFcFMHFnISB5dOlsfT5ugeemqaj7t3H
> Mb8k3PYV23cPn6fwUWqp2BkhiBh/h3uNvtBK4dz7GTL61eumBVRDXfaDVhXKhAA=
> =KDE0
> -----END PGP SIGNATURE-----
--
Alex Bennée
^ permalink raw reply [flat|nested] 16+ messages in thread