Update test definitions metadata

Added meta data to all test cases
In some cases maintainer is assumed basing on git log
Some data is still missing
ubuntu rt-ltp and ltp-realtime are duplicate and rt-ltp will be removed

Change-Id: I04bb1f96cf7682fb8050df12c7dc0fa04b4dea68

59 files changed, 568 insertions, 30 deletions

diff --git a/android/0xbench.yaml b/android/0xbench.yaml
index 6e1b44d3..b5f0d045 100644
--- a/android/0xbench.yaml
+++ b/android/0xbench.yaml
@@ -2,6 +2,18 @@ metadata:
     name: 0xbench
     format: "Lava-Test Test Definition 1.0"
     description: "0xbench test for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - performance
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/bigLITTLE.yaml b/android/bigLITTLE.yaml
index e96dc2b5..fa1ff2e6 100644
--- a/android/bigLITTLE.yaml
+++ b/android/bigLITTLE.yaml
@@ -2,6 +2,15 @@ metadata:
     format: "Lava-Test-Shell Test Definition 1.0"
     name: bigLITTLE
     description: "bigLITTLE"
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - vexpress-tc2
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+        - naresh.kamboju@linaro.org 
 
 run:
     steps:
diff --git a/android/binder.yaml b/android/binder.yaml
index 4a20949d..4828c21a 100644
--- a/android/binder.yaml
+++ b/android/binder.yaml
@@ -2,6 +2,17 @@ metadata:
     name: binder
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Binder test for android."
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - vexpress-a9
+        - vexpress-tc2
+    maintainer:
+        - amit.pundir@linaro.org
 
 run:
     steps:
diff --git a/android/busybox.yaml b/android/busybox.yaml
index 39fc38e9..fb7ff2cd 100644
--- a/android/busybox.yaml
+++ b/android/busybox.yaml
@@ -2,6 +2,18 @@ metadata:
     name: busybox
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test busybox in android."
+    maintainer:
+        - senthil.kumaran@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/cachecoherency.yaml b/android/cachecoherency.yaml
index 5d67e108..fb273fe4 100644
--- a/android/cachecoherency.yaml
+++ b/android/cachecoherency.yaml
@@ -2,6 +2,18 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: cachecoherency.
     description: "cachecoherency test for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/dalvik-vm-unit-tests.yaml b/android/dalvik-vm-unit-tests.yaml
index 44663087..3c257482 100644
--- a/android/dalvik-vm-unit-tests.yaml
+++ b/android/dalvik-vm-unit-tests.yaml
@@ -2,6 +2,18 @@ metadata:
     name: dalvik-vm-unit-tests
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "DalvikVM unit tests for android."
+    maintainer:
+        - amit.pundir@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/gatortest.yaml b/android/gatortest.yaml
index 5cda2ebf..081d40d0 100644
--- a/android/gatortest.yaml
+++ b/android/gatortest.yaml
@@ -2,6 +2,18 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: gatortest
     description: "gatortest for android."
+    maintainer: 
+        -  harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/glmark2.yaml b/android/glmark2.yaml
index b200e3b2..d74b7ac1 100644
--- a/android/glmark2.yaml
+++ b/android/glmark2.yaml
@@ -2,6 +2,16 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: glmark2
     description: "glmark2 test for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - performance
+    devices:
+        - arndale
+        - panda
+        - panda-es
 
 run:
     steps:
diff --git a/android/homescreen.yaml b/android/homescreen.yaml
index 48febb15..78726dbb 100644
--- a/android/homescreen.yaml
+++ b/android/homescreen.yaml
@@ -2,6 +2,18 @@ metadata:
     name: homescreen
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test if the homescreen is up in android."
+    maintainer:
+        - vishal.bhoj@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/ime.yaml b/android/ime.yaml
index c6e431a2..defb848d 100644
--- a/android/ime.yaml
+++ b/android/ime.yaml
@@ -2,6 +2,18 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: ime
     description: "ime test for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/iozone.yaml b/android/iozone.yaml
index 22ff087f..547325d3 100644
--- a/android/iozone.yaml
+++ b/android/iozone.yaml
@@ -2,6 +2,18 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: iozone
     description: "iozone test for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - performance
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/memtester.yaml b/android/memtester.yaml
index c7b9c507..4b0a3a99 100644
--- a/android/memtester.yaml
+++ b/android/memtester.yaml
@@ -2,6 +2,18 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: memtester
     description: "memtester for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/mmtest.yaml b/android/mmtest.yaml
index ba876dd6..31e5007e 100644
--- a/android/mmtest.yaml
+++ b/android/mmtest.yaml
@@ -2,6 +2,18 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: mmtest
     description: "mmtest for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/skia.yaml b/android/skia.yaml
index a422eec6..35e6e801 100644
--- a/android/skia.yaml
+++ b/android/skia.yaml
@@ -2,6 +2,19 @@ metadata:
     name: skia
     format: "Lava-Test Test Definition 1.0"
     description: "skia test for android."
+    maintainer:
+        - fahad.k@linaro.org
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - performance
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/tjbench.yaml b/android/tjbench.yaml
index 04241614..dc140eac 100644
--- a/android/tjbench.yaml
+++ b/android/tjbench.yaml
@@ -2,6 +2,18 @@ metadata:
     format: "Lava-Test Test Definition 1.0"
     name: tjbench
     description: "tjbench test for android."
+    maintainer:
+        - harigopal.gollamudi@linaro.org
+    os:
+        - android
+    scope:
+        - performance
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/android/v8.yaml b/android/v8.yaml
index 3b7f8823..93869ca8 100644
--- a/android/v8.yaml
+++ b/android/v8.yaml
@@ -2,6 +2,18 @@ metadata:
     name: v8
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "v8 shell test. In latest builds we test for d8 shell."
+    maintainer:
+        - senthil.kumaran@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+    devices:
+        - arndale
+        - panda
+        - panda-es
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/openembedded/busybox.yaml b/openembedded/busybox.yaml
index 077792fd..ea4f35a5 100644
--- a/openembedded/busybox.yaml
+++ b/openembedded/busybox.yaml
@@ -1,7 +1,15 @@
 metadata:
     name: busybox
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test busybox in OE."
+    description: "Test busybox in OpenEmbedded."
+    maintainer:
+        - senthil.kumaran@linaro.org
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/cyclictest.yaml b/openembedded/cyclictest.yaml
index 92791594..8e1efc50 100644
--- a/openembedded/cyclictest.yaml
+++ b/openembedded/cyclictest.yaml
@@ -3,6 +3,16 @@ metadata:
     format: "Lava-Test-Shell Test Definition 1.0"
     version: 1.0
     description: "Cyclictest Suite"
+    maintainer:
+        - ciprian.barbu@linaro.org
+        - anders.roxell@linaro.org
+    os:
+        - openembedded
+    scope:
+        - performance
+        - preempt-rt
+    devices:
+        - arndale
 
 run:
     steps:
diff --git a/openembedded/device-tree.yaml b/openembedded/device-tree.yaml
index a97f3508..aa9a0555 100644
--- a/openembedded/device-tree.yaml
+++ b/openembedded/device-tree.yaml
@@ -3,7 +3,7 @@ metadata:
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Device tree test to check the folder structure."
     os:
-        - oe
+        - openembedded
     devices:
         - origen
         - snowball
diff --git a/openembedded/ethernet.yaml b/openembedded/ethernet.yaml
index 05e81ab0..3017c4b6 100644
--- a/openembedded/ethernet.yaml
+++ b/openembedded/ethernet.yaml
@@ -1,7 +1,15 @@
 metadata:
     name: ethernet
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test network in OE."
+    description: "Test network in OpenEmbedded."
+    maintainer:
+        - senthil.kumaran@linaro.org
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/hackbench.yaml b/openembedded/hackbench.yaml
index 5dfaefcb..921b3a8f 100644
--- a/openembedded/hackbench.yaml
+++ b/openembedded/hackbench.yaml
@@ -3,6 +3,16 @@ metadata:
     format: "Lava-Test-Shell Test Definition 1.0"
     version: 1.0
     description: "Hackbench Suite"
+    maintainer:
+        - ciprian.barbu@linaro.org
+        - anders.roxell@linaro.org
+    os:
+        - openembedded
+    devices:
+        - arndale
+    scope:
+        - performance
+        - preempt-rt
 
 run:
     steps:
diff --git a/openembedded/kernel-version.yaml b/openembedded/kernel-version.yaml
index 23d5d7ff..efe23657 100644
--- a/openembedded/kernel-version.yaml
+++ b/openembedded/kernel-version.yaml
@@ -1,7 +1,15 @@
 metadata:
     name: kernel-version
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test kernel version in OE."
+    description: "Test kernel version in OpenEmbedded."
+    maintainer:
+        - senthil.kumaran@linaro.org
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/kvm.yaml b/openembedded/kvm.yaml
index f2b546d4..6b84d776 100644
--- a/openembedded/kvm.yaml
+++ b/openembedded/kvm.yaml
@@ -1,7 +1,18 @@
 metadata:
-    name: kvm
+    name: kvm-oe
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test kvm on openembedded."
+    maintainer:
+        - anders.roxell@linaro.org
+        - riku.voipio@linaro.org
+    scope:
+        - functional
+        - virtualization
+    os:
+        - openembedded
+    devices:
+        - rtsm_ve-armv8
+        - arndale
 
 run:
     steps:
diff --git a/openembedded/libhugetlbfs.yaml b/openembedded/libhugetlbfs.yaml
index 207894a2..c39fefe1 100644
--- a/openembedded/libhugetlbfs.yaml
+++ b/openembedded/libhugetlbfs.yaml
@@ -1,7 +1,20 @@
 metadata:
-    name: libhugetlbfs
+    name: libhugetlbfs-oe
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Run through libhugetlbfs next branch tests."
+    description: "Run through libhugetlbfs next branch tests. 
+                  Runs through 64 bit libhugetlbfs on target system. 
+                  One needs to run with a kernel that supports huge pages, 
+                  also the OpenEmbedded system needs to have the libhugetlbfs 
+                  test suite pre-installed. (Which is the case for recent 
+                  OpenEmbedded builds)."
+    maintainer:
+        - steve.capper@linaro.org
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 run:
     steps:
diff --git a/openembedded/ltp-realtime.yaml b/openembedded/ltp-realtime.yaml
index c1ce5ff8..7c06a3ab 100644
--- a/openembedded/ltp-realtime.yaml
+++ b/openembedded/ltp-realtime.yaml
@@ -1,8 +1,17 @@
 metadata:
-    name: ltp-realtime
+    name: ltp-realtime-oe
     format: "Lava-Test-Shell Test Definition 1.0"
     version: 20130503
-    description: "Run LTP test_realtime on OE."
+    description: "Run LTP test_realtime on OpenEmbedded."
+    maintainer:
+        - anders.roxell@linaro.org
+        - mike.holmes@linaro.org
+    os:
+        - openembedded
+    scope:
+        - preempt-rt
+    devices:
+        - arndale
 
 run:
     steps:
diff --git a/openembedded/ltp.yaml b/openembedded/ltp.yaml
index d3de02f6..052d1df6 100644
--- a/openembedded/ltp.yaml
+++ b/openembedded/ltp.yaml
@@ -1,8 +1,17 @@
 metadata:
-    name: ltp
+    name: ltp-oe
     format: "Lava-Test-Shell Test Definition 1.0"
     version: 20130503
-    description: "Run LTP syscalls on OE."
+    description: "Run LTP syscalls on OpenEmbedded."
+    maintainer:
+        - milosz.wasilewski@linaro.org
+        - fathi.boudra@linaro.org
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 run:
     steps:
diff --git a/openembedded/mauve-sanity-test.yaml b/openembedded/mauve-sanity-test.yaml
index 89b67181..6b4cd7ec 100644
--- a/openembedded/mauve-sanity-test.yaml
+++ b/openembedded/mauve-sanity-test.yaml
@@ -1,8 +1,16 @@
 metadata:
   name: mauve
   format: "Lava-Test-Shell Test Definition 1.0"
-  description: "Mauve Sanity Test for Open Embedded"
+  description: "Mauve Sanity Test for OpenEmbedded"
   version: 1.0
+  maintainer:
+    - andrew.mcdermott@linaro.org
+  os:
+    - openembedded
+  scope:
+    - functional
+  devices:
+    - rtsm_ve-armv8
 
 install:
   git-repos:
diff --git a/openembedded/mauve.yaml b/openembedded/mauve.yaml
index 88495e19..6684f9b0 100644
--- a/openembedded/mauve.yaml
+++ b/openembedded/mauve.yaml
@@ -1,8 +1,16 @@
 metadata:
   name: mauve
   format: "Lava-Test-Shell Test Definition 1.0"
-  description: "Java Mauve Tests for Open Embedded"
+  description: "Java Mauve Tests for OpenEmbedded"
   version: 1.0
+  maintainer:
+    - andrew.mcdermott@linaro.org
+  os:
+    - openembedded
+  scope:
+    - functional
+  devices:
+    - rtsm_ve-armv8
 
 install:
   git-repos:
diff --git a/openembedded/mysql.yaml b/openembedded/mysql.yaml
index 1a32c5fe..654560ed 100644
--- a/openembedded/mysql.yaml
+++ b/openembedded/mysql.yaml
@@ -1,7 +1,15 @@
 metadata:
     name: mysql
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test for mysql in OE."
+    description: "Test for mysql in OpenEmbedded."
+    maintainer:
+        - senthil.kumaran@linaro.org
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/openjdk7-sanity.yaml b/openembedded/openjdk7-sanity.yaml
index 74edfc15..8837fe84 100644
--- a/openembedded/openjdk7-sanity.yaml
+++ b/openembedded/openjdk7-sanity.yaml
@@ -3,6 +3,14 @@ metadata:
   format: "Lava-Test-Shell Test Definition 1.0"
   description: "Validates that the OpenJDK 7 java binary can run and matches version 1.7"
   version: 1.0
+  maintainer:
+    - andrew.mcdermott@linaro.org
+  os:
+    - openembedded
+  scope:
+    - functional
+  devices:
+    - rtsm_ve-armv8
 
 install:
   git-repos:
diff --git a/openembedded/openjdk8-sanity.yaml b/openembedded/openjdk8-sanity.yaml
index 1c022bab..dbe66b27 100644
--- a/openembedded/openjdk8-sanity.yaml
+++ b/openembedded/openjdk8-sanity.yaml
@@ -3,6 +3,14 @@ metadata:
   format: "Lava-Test-Shell Test Definition 1.0"
   description: "Validates that the OpenJDK 8 java binary can run and matches version 1.8"
   version: 1.0
+  maintainer:
+    - andrew.mcdermott@linaro.org
+  os:
+    - openembedded
+  scope:
+    - functional
+  devices:
+    - rtsm_ve-armv8
 
 install:
   git-repos:
diff --git a/openembedded/openvswitch-lng.yaml b/openembedded/openvswitch-lng.yaml
index c5ec503d..17c6022a 100644
--- a/openembedded/openvswitch-lng.yaml
+++ b/openembedded/openvswitch-lng.yaml
@@ -2,6 +2,14 @@ metadata:
     name: openvswitch-lng
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Build and run OVS testsuite."
+    maintainer:
+        - zishen.lim@linaro.org
+    os:
+        - openembedded
+    devices:
+        - arndale
+    scope:
+        - functional
 
 install:
     deps:
diff --git a/openembedded/perf.yaml b/openembedded/perf.yaml
index be6ea4a8..700c659e 100644
--- a/openembedded/perf.yaml
+++ b/openembedded/perf.yaml
@@ -1,7 +1,13 @@
 metadata:
-    name: perf
+    name: perf-oe
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Performance tests in OE."
+    description: "Performance tests in OpenEmbedded."
+    os:
+        - openembedded
+    scope:
+        - performance
+    devices:
+        - rtsm_ve-armv8
 
 install:
     bzr-repos:
diff --git a/openembedded/phpinfo.yaml b/openembedded/phpinfo.yaml
index 7ec365d9..8243ed87 100644
--- a/openembedded/phpinfo.yaml
+++ b/openembedded/phpinfo.yaml
@@ -1,7 +1,13 @@
 metadata:
     name: phpinfo
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test for phpinfo() in OE."
+    description: "Test for phpinfo() in OpenEmbedded."
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/phpmysql.yaml b/openembedded/phpmysql.yaml
index eb49c4a0..e1b561d1 100644
--- a/openembedded/phpmysql.yaml
+++ b/openembedded/phpmysql.yaml
@@ -1,7 +1,13 @@
 metadata:
     name: phpmysql
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test for php/mysql in OE."
+    description: "Test for php/mysql in OpenEmbedded."
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/pwrmgmt.yaml b/openembedded/pwrmgmt.yaml
index 7603ff19..11ebedef 100644
--- a/openembedded/pwrmgmt.yaml
+++ b/openembedded/pwrmgmt.yaml
@@ -1,7 +1,14 @@
 metadata:
-    name: pwrmgmt
+    name: pwrmgmt-oe
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test power management."
+    os:
+        - openembedded
+    scope:
+        - functional
+        - performance
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/sdkhelloc.yaml b/openembedded/sdkhelloc.yaml
index b072739a..c195694e 100644
--- a/openembedded/sdkhelloc.yaml
+++ b/openembedded/sdkhelloc.yaml
@@ -1,7 +1,13 @@
 metadata:
     name: sdkhelloc
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test for C compiler in OE."
+    description: "Test for C compiler in OpenEmbedded."
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/sdkhellocxx.yaml b/openembedded/sdkhellocxx.yaml
index 68edfe40..e86af7b4 100644
--- a/openembedded/sdkhellocxx.yaml
+++ b/openembedded/sdkhellocxx.yaml
@@ -1,7 +1,13 @@
 metadata:
     name: sdkhellocxx
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test for C++ compiler in OE."
+    description: "Test for C++ compiler in OpenEmbedded."
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/openembedded/toolchain.yaml b/openembedded/toolchain.yaml
index a7b4890d..7b3c97cd 100644
--- a/openembedded/toolchain.yaml
+++ b/openembedded/toolchain.yaml
@@ -1,7 +1,15 @@
 metadata:
     name: toolchain
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Test if we have toolchain installed in OE."
+    description: "Test if we have toolchain installed in OpenEmbedded."
+    maintainer:
+        - senthil.kumaran@linaro.org
+    os:
+        - openembedded
+    scope:
+        - functional
+    devices:
+        - rtsm_ve-armv8
 
 install:
     git-repos:
diff --git a/ubuntu/aapits.yaml b/ubuntu/aapits.yaml
index 6fc2de7e..c4a0b88c 100644
--- a/ubuntu/aapits.yaml
+++ b/ubuntu/aapits.yaml
@@ -2,6 +2,12 @@ metadata:
     name: aapits
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run ACPI API test suite"
+    os:
+        - ubuntu
+    devices:
+        - highbank
+    scope:
+        - functional
 
 install:
     git-repos:
diff --git a/ubuntu/acpi-abat.yaml b/ubuntu/acpi-abat.yaml
index 4e261807..21817858 100644
--- a/ubuntu/acpi-abat.yaml
+++ b/ubuntu/acpi-abat.yaml
@@ -2,7 +2,14 @@ metadata:
     name: abat
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test Automated Basic Acceptance Tests (ABAT)"
-
+    os:
+        - ubuntu
+    devices:
+        - highbank
+    scope:
+        - functional
+    maintainer:
+        - naresh.bhat@linaro.org
 install:
     steps:
         - 'apt-get install --yes wget'
diff --git a/ubuntu/acpica.yaml b/ubuntu/acpica.yaml
index 9ae8ea16..cb98abfa 100644
--- a/ubuntu/acpica.yaml
+++ b/ubuntu/acpica.yaml
@@ -2,6 +2,12 @@ metadata:
     name: acpica
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test ACPICA"
+    os:
+        - ubuntu
+    devices:
+        - highbank
+    scope:
+        - functional
 
 install:
     git-repos:
diff --git a/ubuntu/bluetooth-enablement.yaml b/ubuntu/bluetooth-enablement.yaml
index 72fccb66..45f069c1 100644
--- a/ubuntu/bluetooth-enablement.yaml
+++ b/ubuntu/bluetooth-enablement.yaml
@@ -4,6 +4,9 @@ metadata:
     description: "Test bluetooth enablement"
     os:
         - ubuntu
+    scope:
+        - functional
+    devices:
 
 install:
     deps:
diff --git a/ubuntu/dmidecode.yaml b/ubuntu/dmidecode.yaml
index 9e9a2b99..e459a337 100644
--- a/ubuntu/dmidecode.yaml
+++ b/ubuntu/dmidecode.yaml
@@ -3,6 +3,16 @@ metadata:
   format: "Lava-Test-Shell Test Definition 1.0"
   description: "DMI Decode Test"
   version: 1.0
+  os:
+    - ubuntu
+  devices:
+    - arndale
+    - panda
+    - beaglebone-black
+    - beagle-xm
+    - mx53loco
+  scope:
+    - functional
 
 install:
     deps:
diff --git a/ubuntu/fwts.yaml b/ubuntu/fwts.yaml
index 0c3f19a1..dafecaca 100644
--- a/ubuntu/fwts.yaml
+++ b/ubuntu/fwts.yaml
@@ -2,6 +2,16 @@ metadata:
     name: fwts
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run Firmware Test Suite (fwts)"
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 install:
     deps:
diff --git a/ubuntu/gatortests.yaml b/ubuntu/gatortests.yaml
index a13999de..4b59e6c5 100644
--- a/ubuntu/gatortests.yaml
+++ b/ubuntu/gatortests.yaml
@@ -2,6 +2,16 @@ metadata:
     name: gatortests
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run GATOR tests"
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 install:
     deps:
diff --git a/ubuntu/kvm.yaml b/ubuntu/kvm.yaml
index bea14d8b..85115aa1 100644
--- a/ubuntu/kvm.yaml
+++ b/ubuntu/kvm.yaml
@@ -2,6 +2,16 @@ metadata:
     name: kvm
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test KVM"
+    maintainer:
+        - riku.voipio@linaro.org
+    scope:
+        - functional
+        - virtualization
+    os:
+        - openembedded
+    devices:
+        - arndale
+        - vexpress-tc2
 
 install:
     deps:
diff --git a/ubuntu/latency-test.yaml b/ubuntu/latency-test.yaml
index b01fa049..d2613626 100644
--- a/ubuntu/latency-test.yaml
+++ b/ubuntu/latency-test.yaml
@@ -3,12 +3,14 @@ metadata:
     version: "1.0"
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run latency test"
-os:
-    - ubuntu
-devices:
-    - arndale
-environment:
-    - lava-test-shell
+    maintainer:
+        - mike.holmes@linaro.org
+    os:
+        - ubuntu
+    devices:
+        - arndale
+    environment:
+        - lava-test-shell
 install:
     git-repos:
         - 'git://git.linaro.org/people/mike.holmes/latency-test.git'
diff --git a/ubuntu/libhugetlbfs.yaml b/ubuntu/libhugetlbfs.yaml
index 03ea9605..83b112cc 100644
--- a/ubuntu/libhugetlbfs.yaml
+++ b/ubuntu/libhugetlbfs.yaml
@@ -2,6 +2,18 @@ metadata:
     name: libhugetlbfs
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run through libhugetlbfs next branch tests"
+    maintainer:
+        - steve.capper@linaro.org
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 install:
     git-repos:
diff --git a/ubuntu/ltp-network.yaml b/ubuntu/ltp-network.yaml
index cd108d1e..69cb4885 100644
--- a/ubuntu/ltp-network.yaml
+++ b/ubuntu/ltp-network.yaml
@@ -1,7 +1,20 @@
 metadata:
-    name: ltp
+    name: ltp-network
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run LTP network tests"
+    maintainer:
+        - milosz.wasilewski@linaro.org
+        - fathi.boudra@linaro.org
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 install:
     steps:
diff --git a/ubuntu/ltp-realtime.yaml b/ubuntu/ltp-realtime.yaml
index 50f56a22..ab27beb5 100644
--- a/ubuntu/ltp-realtime.yaml
+++ b/ubuntu/ltp-realtime.yaml
@@ -2,6 +2,19 @@ metadata:
     name: rt-ltp
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run LTP realtime tests"
+    maintainer:
+        - milosz.wasilewski@linaro.org
+        - fathi.boudra@linaro.org
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 install:
     steps:
diff --git a/ubuntu/ltp.yaml b/ubuntu/ltp.yaml
index 73ec80ca..e3cb8d29 100644
--- a/ubuntu/ltp.yaml
+++ b/ubuntu/ltp.yaml
@@ -2,6 +2,19 @@ metadata:
     name: ltp
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run LTP syscalls tests"
+    maintainer:
+        - milosz.wasilewski@linaro.org
+        - fathi.boudra@linaro.org
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 install:
     steps:
diff --git a/ubuntu/network-tests-basic.yaml b/ubuntu/network-tests-basic.yaml
index 845324d8..61dda7df 100644
--- a/ubuntu/network-tests-basic.yaml
+++ b/ubuntu/network-tests-basic.yaml
@@ -2,6 +2,18 @@ metadata:
     format: Lava-Test Test Definition 1.0
     name: network-tests-basic
     description: "Basic network test commands for Linaro Ubuntu images"
+    maintainer:
+        - botao.sun@linaro.org
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/ubuntu/perf.yaml b/ubuntu/perf.yaml
index 6eac2411..cc87e1cb 100644
--- a/ubuntu/perf.yaml
+++ b/ubuntu/perf.yaml
@@ -4,6 +4,8 @@ metadata:
     description: "Run performance tests (perf)"
     os:
         - ubuntu
+    scope:
+        - performance
     devices:
         - origen
         - snowball
diff --git a/ubuntu/pwrmgmt.yaml b/ubuntu/pwrmgmt.yaml
index 0e36b79b..f018c579 100644
--- a/ubuntu/pwrmgmt.yaml
+++ b/ubuntu/pwrmgmt.yaml
@@ -2,6 +2,17 @@ metadata:
     name: pwrmgmt
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Test power management (PM-QA)"
+    os:
+        - ubuntu
+    scope:
+        - functional
+        - performance
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 install:
     deps:
diff --git a/ubuntu/rt-hackbench.yaml b/ubuntu/rt-hackbench.yaml
index d733492f..450b2b60 100644
--- a/ubuntu/rt-hackbench.yaml
+++ b/ubuntu/rt-hackbench.yaml
@@ -2,6 +2,15 @@ metadata:
     name: rt-hackbench
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run Hackbench Real Time Suite"
+    maintainer:
+        - tyler.baker@linaro.org
+    scope:
+        - functional
+        - preempt_rt
+    devices:
+        - arndale
+    os:
+        - ubuntu
 
 install:
     git-repos:
diff --git a/ubuntu/rt-ltp.yaml b/ubuntu/rt-ltp.yaml
index 815db496..5ea82f67 100644
--- a/ubuntu/rt-ltp.yaml
+++ b/ubuntu/rt-ltp.yaml
@@ -2,6 +2,15 @@ metadata:
     name: rt-ltp
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run LTP realtime tests"
+    maintainer:
+        - tyler.baker@linaro.org
+    scope:
+        - functional
+        - preempt_rt
+    devices:
+        - arndale
+    os:
+        - ubuntu
 
 install:
     steps:
diff --git a/ubuntu/smoke-tests-basic.yaml b/ubuntu/smoke-tests-basic.yaml
index 999fdb80..baac915b 100644
--- a/ubuntu/smoke-tests-basic.yaml
+++ b/ubuntu/smoke-tests-basic.yaml
@@ -2,6 +2,18 @@ metadata:
     format: Lava-Test Test Definition 1.0
     name: smoke-tests-basic
     description: "Basic system test command for Linaro Ubuntu images"
+    maintainer:
+        - botao.sun@linaro.org
+    os:
+        - ubuntu
+    scope:
+        - functional
+    devices:
+        - panda
+        - panda-es
+        - arndale
+        - vexpress-a9
+        - vexpress-tc2
 
 run:
     steps:
diff --git a/ubuntu/wifi-enablement.yaml b/ubuntu/wifi-enablement.yaml
index 207b89df..5f2172ea 100644
--- a/ubuntu/wifi-enablement.yaml
+++ b/ubuntu/wifi-enablement.yaml
@@ -4,6 +4,8 @@ metadata:
     description: "Test wifi enablement"
     os:
         - ubuntu
+    scope:
+        - functional
 
 install:
     git-repos: