aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2017-02-20 10:51:39 +0000
committerFam Zheng <famz@redhat.com>2017-02-24 14:18:11 +0800
commite70dc7f854392c7090db279b546b24c6b3ca6567 (patch)
tree6f858f48a8e8baca07d0a165af5d78147f0b6d33
parentd92d886a3b6daadb79d1635ad281685e80d3ac98 (diff)
downloadqemu-e70dc7f854392c7090db279b546b24c6b3ca6567.zip
qemu-e70dc7f854392c7090db279b546b24c6b3ca6567.tar.gz
qemu-e70dc7f854392c7090db279b546b24c6b3ca6567.tar.bz2
MAINTAINERS: merge Build and test automation with Docker tests
The docker framework is really just another piece in the build automation puzzle so lets merge it together. For added bonus I've also included the Travis and Patchew status links. The Shippable links will be added later once mainline tests have been configured and setup. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Fam Zheng <famz@redhat.com> Message-Id: <20170220105139.21581-5-alex.bennee@linaro.org> Signed-off-by: Fam Zheng <famz@redhat.com>
-rw-r--r--MAINTAINERS12
1 files changed, 5 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6740467..be79f68 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1800,10 +1800,14 @@ F: docs/block-replication.txt
Build and test automation
-------------------------
M: Alex Bennée <alex.bennee@linaro.org>
+M: Fam Zheng <famz@redhat.com>
L: qemu-devel@nongnu.org
-S: Supported
+S: Maintained
F: .travis.yml
F: .shippable.yml
+F: tests/docker/
+W: https://travis-ci.org/qemu/qemu
+W: http://patchew.org/QEMU/
Documentation
-------------
@@ -1812,9 +1816,3 @@ M: Daniel P. Berrange <berrange@redhat.com>
S: Odd Fixes
F: docs/build-system.txt
-Docker testing
---------------
-Docker based testing framework and cases
-M: Fam Zheng <famz@redhat.com>
-S: Maintained
-F: tests/docker/