plans: introduce linaro test plan v2

* Simplify test plan format.
* Update test-runner for the change in test plan.
* Update existing test plans to v2.

Change-Id: Ic10e6eb3d17cbf54140831d0e030dcbbb95c75db
Signed-off-by: Chase Qi <chase.qi@linaro.org>

5 files changed, 187 insertions, 423 deletions

diff --git a/plans/erp/erp-enterprise.yaml b/plans/erp/erp-enterprise.yaml
index 7bcdaae..2439c52 100644
--- a/plans/erp/erp-enterprise.yaml
+++ b/plans/erp/erp-enterprise.yaml
@@ -15,104 +15,36 @@ metadata:
     - chase.qi@linaro.org
   approver:
     - milosz.wasilewski@linaro.org
-  format: Linaro Test Plan v1
+  owner:
+    - martin.stadtler@linaro.org
+  format: Linaro Test Plan v2
 
-requirements:
-  - name: Docker
-    owner: martin.stadtler@linaro.org
-    category: Virtualization
-    tests:
-      automated:
-        - path: automated/linux/docker/docker.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/dsdbench/dsdbench.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: OpenJDK
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      automated:
-        - path: automated/linux/openjdk/openjdk-smoke.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: MySQL database
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      automated:
-        - path: automated/linux/lamp/lamp.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Apache webserver
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      automated:
-        - path: automated/linux/lamp/lamp.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: NGiNX webserver
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      automated:
-        - path: automated/linux/lemp/lemp.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Tomcat webserver
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-  - name: OpenSSH
-    owner: martin.stadtler@linaro.org
-    category: Base OS
-    tests:
-      manual:
-        - path: manual/generic/linux/openssh-centos.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: OpenSSL
-    owner: martin.stadtler@linaro.org
-    category: Base OS
-    tests:
-      manual:
-        - path: manual/generic/linux/openssl-centos.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: OpenStack (Core)
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      manual:
-        - path: manual/enterprise/openstack-ceph.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Ceph
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      manual:
-        - path: manual/enterprise/openstack-ceph.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Hadoop
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      manual:
-        - path: manual/enterprise/bigdata-hadoop-terasort.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: manual/enterprise/bigdata-hive.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Spark
-    owner: martin.stadtler@linaro.org
-    category: Enterprise
-    tests:
-      manual:
-        - path: manual/enterprise/bigdata-spark-sparkpi.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
+tests:
+  automated:
+    - path: automated/linux/docker/docker.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/dsdbench/dsdbench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/openjdk/openjdk-smoke.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/lamp/lamp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/lamp/lamp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/lemp/lemp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+  manual:
+    - path: manual/generic/linux/openssh-centos.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/openssl-centos.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/enterprise/openstack-ceph.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/enterprise/openstack-ceph.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/enterprise/bigdata-hadoop-terasort.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/enterprise/bigdata-hive.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/enterprise/bigdata-spark-sparkpi.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
diff --git a/plans/erp/erp-functional.yaml b/plans/erp/erp-functional.yaml
index fd72070..76e32d2 100644
--- a/plans/erp/erp-functional.yaml
+++ b/plans/erp/erp-functional.yaml
@@ -15,159 +15,63 @@ metadata:
     - chase.qi@linaro.org
   approver:
     - milosz.wasilewski@linaro.org
-  format: Linaro Test Plan v1
+  owner:
+    - martin.stadtler@linaro.org
+  format: Linaro Test Plan v2
 
-requirements:
-  - name: SBBR compliance
-    owner: martin.stadtler@linaro.org
-    category: Bootloader
-    tests:
-      manual:
-        - path: manual/generic/linux/luvos.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: PXE boot
-    owner: martin.stadtler@linaro.org
-    category: Bootloader
-    tests:
-      manual:
-        - path: manual/generic/linux/pxe-boot.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: boot from the installed hard drive media
-    owner: martin.stadtler@linaro.org
-    category: Bootloader
-    tests:
-      manual:
-        - path: manual/generic/linux/disk-boot.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Linux kernel
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      manual:
-      automated:
-        - path: automated/linux/smoke/smoke.yaml
-          timeout: 1800
-          mandatory: True
-          repository: https://git.linaro.org/qa/test-definitions.git
-        - path: automated/linux/libhugetlbfs/libhugetlbfs.yaml
-          mandatory: True
-          repository: https://git.linaro.org/qa/test-definitions.git
-  - name: UART console
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      manual:
-        - path: manual/generic/serial-console.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Toolchain
-    owner: martin.stadtler@linaro.org
-    category: Base OS
-    tests:
-      automated:
-        - path: automated/linux/toolchain-smoke/toolchain-smoke.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/toolchain-smoke/toolchain-smoke.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-              STATIC: True
-        - path: automated/linux/pointer-tagging/pointer-tagging-tests.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/kernel-compilation/kernel-compilation.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: SATA drive support
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      automated:
-        - path: automated/linux/disk-partitioning/disk-partitioning.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-            DEVICE: /dev/sdb
-        - path: automated/linux/disk-partitioning/disk-partitioning.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-            DEVICE: /dev/sdb
-            FILESYSTEM: fat32
-            SKIP_INSTALL: True
-  - name: RAID support
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      manual:
-        - path: manual/generic/linux/software-raid0.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: False
-        - path: manual/generic/linux/software-raid1.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: False
-        - path: manual/generic/linux/software-raid5.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: False
-  - name: onboard ethernet support
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      automated:
-        - path: automated/linux/network-basic/network-basic.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-      manual:
-        - path: manual/generic/linux/multi-nic-download.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: False
-  - name: PCIe support
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      automated:
-        - path: automated/linux/network-basic/network-basic.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-      manual:
-        - path: manual/generic/linux/multi-nic-download.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: manual/generic/linux/ip-forwarding.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: False
-        # 1,4,8,16 lane card with SSD, partitioning and FIO/read write tests
-  - name: software shutdown
-    owner: martin.stadtler@linaro.org
-    category: Base OS
-    tests:
-      manual:
-        - path: manual/generic/linux/power-off-cmd.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: software reboot
-    owner: martin.stadtler@linaro.org
-    category: Base OS
-    tests:
-      manual:
-        - path: manual/generic/linux/reboot.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: KVM system emulation
-    owner: martin.stadtler@linaro.org
-    category: Virtualization
-    tests:
-      manual:
-        - path: manual/generic/linux/kvm-arm32-guest-on-arm64-host.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: manual/generic/linux/kvm-arm64-guest-on-arm64-host.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        # compare IO (fio) for host and guest *
-        # compare network performance (netperf) for host and guest
-        # network bandwith/latency stability with system running at high load
+tests:
+  automated:
+    - path: automated/linux/smoke/smoke.yaml
+      timeout: 1800
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/libhugetlbfs/libhugetlbfs.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/toolchain-smoke/toolchain-smoke.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/toolchain-smoke/toolchain-smoke.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      parameters:
+          STATIC: True
+    - path: automated/linux/pointer-tagging/pointer-tagging-tests.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/kernel-compilation/kernel-compilation.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/disk-partitioning/disk-partitioning.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      parameters:
+          DEVICE: /dev/sdb
+    - path: automated/linux/disk-partitioning/disk-partitioning.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      parameters:
+          DEVICE: /dev/sdb
+          FILESYSTEM: fat32
+          SKIP_INSTALL: True
+    - path: automated/linux/network-basic/network-basic.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+  manual:
+    - path: manual/generic/linux/luvos.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/pxe-boot.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/disk-boot.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/serial-console.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/software-raid0.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/software-raid1.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/software-raid5.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/multi-nic-download.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/ip-forwarding.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/power-off-cmd.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/reboot.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/kvm-arm32-guest-on-arm64-host.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: manual/generic/linux/kvm-arm64-guest-on-arm64-host.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
diff --git a/plans/erp/erp-ltp.yaml b/plans/erp/erp-ltp.yaml
index c535b45..52782a6 100644
--- a/plans/erp/erp-ltp.yaml
+++ b/plans/erp/erp-ltp.yaml
@@ -15,18 +15,15 @@ metadata:
     - chase.qi@linaro.org
   approver:
     - milosz.wasilewski@linaro.org
-  format: Linaro Test Plan v1
+  owner:
+    - martin.stadtler@linaro.org
+  format: Linaro Test Plan v2
 
-requirements:
-  - name: Linux kernel
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      automated:
-        - path: automated/linux/ltp/ltp.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          parameters:
-              TST_CMDFILES: syscalls,mm,math,timers,fcntl-locktests,ipc,fsx,fs,hugetlb,io,nptl,pty,containers,fs_bind,filecaps,admin_tools,connectors
-              SKIPFILE: skipfile-rpk
-          mandatory: True
-          timeout: 18000
+tests:
+  automated:
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      parameters:
+          TST_CMDFILES: syscalls,mm,math,timers,fcntl-locktests,ipc,fsx,fs,hugetlb,io,nptl,pty,containers,fs_bind,filecaps,admin_tools,connectors
+          SKIPFILE: skipfile-rpk
+      timeout: 18000
diff --git a/plans/erp/erp-performance.yaml b/plans/erp/erp-performance.yaml
index cef0864..47dbe68 100644
--- a/plans/erp/erp-performance.yaml
+++ b/plans/erp/erp-performance.yaml
@@ -15,126 +15,59 @@ metadata:
     - chase.qi@linaro.org
   approver:
     - milosz.wasilewski@linaro.org
-  format: Linaro Test Plan v1
+  owner:
+    - martin.stadtler@linaro.org
+  format: Linaro Test Plan v2
 
-requirements:
-  - name: Linux kernel
-    owner: martin.stadtler@linaro.org
-    category: Low-level kernel
-    tests:
-      manual:
-      automated:
-        - path: automated/linux/hackbench/hackbench.yaml
-          mandatory: True
-          repository: https://git.linaro.org/qa/test-definitions.git
-  - name: KVM system emulation
-    owner: martin.stadtler@linaro.org
-    category: Virtualization
-    tests:
-      manual:
-          # hackbench should be executed inside KVM guest
-        - path: automated/linux/hackbench/hackbench.yaml
-          mandatory: True
-          repository: https://git.linaro.org/qa/test-definitions.git
-          parameters:
-              TARGET: guest
-  - name: OpenSSL
-    owner: martin.stadtler@linaro.org
-    category: Base OS
-    tests:
-      automated:
-        - path: automated/linux/openssl/openssl-speed.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Networking performance
-    owner: martin.stadtler@linaro.org
-    tests:
-      automated:
-        - path: automated/linux/iperf/iperf.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Memory performance
-    owner: martin.stadtler@linaro.org
-    category: Performance
-    tests:
-       automated:
-        - path: automated/linux/lmbench/lmbench-memory.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/stream/stream-uniprocessor.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Disk performance
-    owner: martin.stadtler@linaro.org
-    category: Performance
-    tests:
-      automated:
-        - path: automated/linux/fio-test/fio-test.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/dd-wr-speed/dd-wr-speed.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/device-read-perf/device-read-perf.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/blogbench/blogbench.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/iozone/iozone.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: CPU performance
-    owner: martin.stadtler@linaro.org
-    category: Performance
-    tests:
-       automated:
-        - path: automated/linux/linpack/linpack.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-        - path: automated/linux/lapack/lapack.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: Apache webserver performance
-    owner: martin.stadtler@linaro.org
-    category: Performance
-    tests:
-       automated:
-        - path: automated/linux/apache-apache-bench/apache-bench.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-              NUMBER: 10000
-              CONCURENT: 500
-  - name: NGiNX webserver performance
-    owner: martin.stadtler@linaro.org
-    category: Performance
-    tests:
-       automated:
-        - path: automated/linux/nginx-apache-bench/apache-bench.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-              NUMBER: 10000
-              CONCURENT: 500
-  - name: Unixbench
-    owner: martin.stadtler@linaro.org
-    category: Performance
-    tests:
-       automated:
-        - path: automated/linux/unixbench/unixbench.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-  - name: sysbench
-    owner: martin.stadtler@linaro.org
-    category: Performance
-    tests:
-       automated:
-        - path: automated/linux/sysbench/sysbench.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-              # Included 'oltp' to meansure database performance.
-              # Excluded 'fileio' as it is already covered by the above
-              # separate 'fio-test.yaml' test case.
-              TESTS: "cpu memory threads mutex oltp"
+tests:
+  automated:
+    - path: automated/linux/hackbench/hackbench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/openssl/openssl-speed.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/iperf/iperf.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/lmbench/lmbench-memory.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/stream/stream-uniprocessor.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/fio-test/fio-test.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/dd-wr-speed/dd-wr-speed.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/device-read-perf/device-read-perf.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/blogbench/blogbench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/iozone/iozone.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/linpack/linpack.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/lapack/lapack.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/apache-apache-bench/apache-bench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      parameters:
+          NUMBER: 10000
+          CONCURENT: 500
+    - path: automated/linux/nginx-apache-bench/apache-bench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      mandatory: True
+      parameters:
+          NUMBER: 10000
+          CONCURENT: 500
+    - path: automated/linux/unixbench/unixbench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+    - path: automated/linux/sysbench/sysbench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      parameters:
+          # Included 'oltp' to meansure database performance.
+          # Excluded 'fileio' as it is already covered by the above
+          # separate 'fio-test.yaml' test case.
+          TESTS: "cpu memory threads mutex oltp"
+  manual:
+      # hackbench should be executed inside KVM guest
+    - path: automated/linux/hackbench/hackbench.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      parameters:
+          TARGET: guest
diff --git a/plans/erp/erp-stress.yaml b/plans/erp/erp-stress.yaml
index f3422d1..f494b70 100644
--- a/plans/erp/erp-stress.yaml
+++ b/plans/erp/erp-stress.yaml
@@ -15,36 +15,34 @@ metadata:
     - chase.qi@linaro.org
   approver:
     - milosz.wasilewski@linaro.org
-  format: Linaro Test Plan v1
+  owner:
+    - martin.stadtler@linaro.org
+  format: Linaro Test Plan v2
 
-requirements:
-  - name: System robustness
-    owner: martin.stadtler@linaro.org
-    category: stress
-    tests:
-      automated:
-        - path: automated/linux/24h-stress-test/24h-stress-test.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-              TEST: stress_ng
-              DURATION: 28800
-        - path: automated/linux/24h-stress-test/24h-stress-test.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-              TEST: stress_oom
-              DURATION: 28800
-        - path: automated/linux/24h-stress-test/24h-stress-test.yaml
-          repository: https://git.linaro.org/qa/test-definitions.git
-          mandatory: True
-          parameters:
-              TEST: stress_network
-              DURATION: 28800
-              # Might be different for each platform with systemd.
-              INTERFACE: eth0
-              # To test the maximum bandwidth, please download stress-network.img with
-              # the following link, place it on local http server and modify 'LINK'.
-              # File download link: http://testdata.validation.linaro.org/stress/stress-network.img
-              # Here is an example.
-              LINK: "http://192.168.3.1/testdata/stress-network.img"
+tests:
+  automated:
+    - path: automated/linux/24h-stress-test/24h-stress-test.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      mandatory: True
+      parameters:
+          TEST: stress_ng
+          DURATION: 28800
+    - path: automated/linux/24h-stress-test/24h-stress-test.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      mandatory: True
+      parameters:
+          TEST: stress_oom
+          DURATION: 28800
+    - path: automated/linux/24h-stress-test/24h-stress-test.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      mandatory: True
+      parameters:
+          TEST: stress_network
+          DURATION: 28800
+          # Might be different for each platform with systemd.
+          INTERFACE: eth0
+          # To test the maximum bandwidth, please download stress-network.img with
+          # the following link, place it on local http server and modify 'LINK'.
+          # File download link: http://testdata.validation.linaro.org/stress/stress-network.img
+          # Here is an example.
+          LINK: "http://192.168.3.1/testdata/stress-network.img"