[v5,4/4] MAINTAINERS: merge Build and test automation with Docker tests

Message ID 20170220105139.21581-5-alex.bennee@linaro.org
State New
Headers show
Series
  • Docker cross-compile targets and user build support
Related show

Commit Message

Alex Bennée Feb. 20, 2017, 10:51 a.m.
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>


---
v4
  - fix merge fail (.shippable.yml)
---
 MAINTAINERS | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

-- 
2.11.0

Patch hide | download patch | download mbox

diff --git a/MAINTAINERS b/MAINTAINERS
index 6dcbebf072..d3782691dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1801,10 +1801,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
 -------------
@@ -1813,9 +1817,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/