plans: update erp test plan

* Use erp as test plan name instead of rpb_ee.
* Removed release version from test plan name so that we don't have to
  update it for each release.
* Added iozone and sysbench tests.

Change-Id: Iaed1aa4e11eda45d06cb7510ae4c5da2b9b6011f
Signed-off-by: Chase Qi <chase.qi@linaro.org>
(cherry picked from commit e110ddba92baac35877e17ac285089b40f3fd559)

6 files changed, 142 insertions, 86 deletions

diff --git a/plans/rpb_ee/rpb_ee_enterprise.yaml b/plans/erp/erp-enterprise.yaml
index 5317b53e..7bcdaae4 100644
--- a/plans/rpb_ee/rpb_ee_enterprise.yaml
+++ b/plans/erp/erp-enterprise.yaml
@@ -1,7 +1,7 @@
 metadata:
-  name: rpb-ee-1612-enterprise
+  name: erp-enterprise
   description: Test plan for EE RPB. Common features across all boards
-  os: CentOS
+  os: Debian
   devices:
     - d03
     - d05
@@ -11,13 +11,15 @@ metadata:
     - overdrive
   maintainer:
     - milosz.wasilewski@linaro.org
+    - dan.rue@linaro.org
+    - chase.qi@linaro.org
   approver:
-    - alan.benett@linaro.org
+    - milosz.wasilewski@linaro.org
   format: Linaro Test Plan v1
 
 requirements:
   - name: Docker
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Virtualization
     tests:
       automated:
@@ -36,7 +38,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: MySQL database
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Enterprise
     tests:
       automated:
@@ -44,7 +46,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: Apache webserver
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Enterprise
     tests:
       automated:
@@ -52,7 +54,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: NGiNX webserver
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Enterprise
     tests:
       automated:
@@ -60,11 +62,11 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: Tomcat webserver
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Enterprise
     tests:
   - name: OpenSSH
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Base OS
     tests:
       manual:
@@ -72,7 +74,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: OpenSSL
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Base OS
     tests:
       manual:
diff --git a/plans/rpb_ee/rpb_ee_functional.yaml b/plans/erp/erp-functional.yaml
index 0a656c0e..fd72070c 100644
--- a/plans/rpb_ee/rpb_ee_functional.yaml
+++ b/plans/erp/erp-functional.yaml
@@ -1,7 +1,7 @@
 metadata:
-  name: rpb-ee-1612-functional
+  name: erp-functional
   description: Test plan for EE RPB. Common features across all boards
-  os: CentOS
+  os: Debian
   devices:
     - d03
     - d05
@@ -11,13 +11,15 @@ metadata:
     - overdrive
   maintainer:
     - milosz.wasilewski@linaro.org
+    - dan.rue@linaro.org
+    - chase.qi@linaro.org
   approver:
-    - alan.benett@linaro.org
+    - milosz.wasilewski@linaro.org
   format: Linaro Test Plan v1
 
 requirements:
   - name: SBBR compliance
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Bootloader
     tests:
       manual:
@@ -25,7 +27,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: PXE boot
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Bootloader
     tests:
       manual:
@@ -33,7 +35,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: boot from the installed hard drive media
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Bootloader
     tests:
       manual:
@@ -41,7 +43,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: Linux kernel
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Low-level kernel
     tests:
       manual:
@@ -50,17 +52,11 @@ requirements:
           timeout: 1800
           mandatory: True
           repository: https://git.linaro.org/qa/test-definitions.git
-        - 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
         - path: automated/linux/libhugetlbfs/libhugetlbfs.yaml
           mandatory: True
           repository: https://git.linaro.org/qa/test-definitions.git
   - name: UART console
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Low-level kernel
     tests:
       manual:
@@ -68,7 +64,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: Toolchain
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Base OS
     tests:
       automated:
@@ -87,7 +83,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: SATA drive support
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Low-level kernel
     tests:
       automated:
@@ -104,7 +100,7 @@ requirements:
             FILESYSTEM: fat32
             SKIP_INSTALL: True
   - name: RAID support
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Low-level kernel
     tests:
       manual:
@@ -118,7 +114,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: False
   - name: onboard ethernet support
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Low-level kernel
     tests:
       automated:
@@ -130,7 +126,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: False
   - name: PCIe support
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Low-level kernel
     tests:
       automated:
@@ -146,7 +142,7 @@ requirements:
           mandatory: False
         # 1,4,8,16 lane card with SSD, partitioning and FIO/read write tests
   - name: software shutdown
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Base OS
     tests:
       manual:
@@ -154,7 +150,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: software reboot
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Base OS
     tests:
       manual:
@@ -162,7 +158,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: KVM system emulation
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Virtualization
     tests:
       manual:
diff --git a/plans/erp/erp-ltp.yaml b/plans/erp/erp-ltp.yaml
new file mode 100644
index 00000000..c535b45a
--- /dev/null
+++ b/plans/erp/erp-ltp.yaml
@@ -0,0 +1,32 @@
+metadata:
+  name: erp-ltp
+  description: Test plan for EE RPB. Common features across all boards
+  os: Debian
+  devices:
+    - d03
+    - d05
+    - thunderX
+    - moonshot
+    - mustang
+    - overdrive
+  maintainer:
+    - milosz.wasilewski@linaro.org
+    - dan.rue@linaro.org
+    - chase.qi@linaro.org
+  approver:
+    - milosz.wasilewski@linaro.org
+  format: Linaro Test Plan v1
+
+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
diff --git a/plans/rpb_ee/rpb_ee_performance.yaml b/plans/erp/erp-performance.yaml
index 3f0b1569..8f51be04 100644
--- a/plans/rpb_ee/rpb_ee_performance.yaml
+++ b/plans/erp/erp-performance.yaml
@@ -1,7 +1,7 @@
 metadata:
-  name: rpb-ee-1612-performance
+  name: erp-performance
   description: Test plan for EE RPB. Common features across all boards
-  os: CentOS
+  os: Debian
   devices:
     - d03
     - d05
@@ -11,13 +11,15 @@ metadata:
     - overdrive
   maintainer:
     - milosz.wasilewski@linaro.org
+    - dan.rue@linaro.org
+    - chase.qi@linaro.org
   approver:
-    - alan.benett@linaro.org
+    - milosz.wasilewski@linaro.org
   format: Linaro Test Plan v1
 
 requirements:
   - name: Linux kernel
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Low-level kernel
     tests:
       manual:
@@ -26,7 +28,7 @@ requirements:
           mandatory: True
           repository: https://git.linaro.org/qa/test-definitions.git
   - name: KVM system emulation
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Virtualization
     tests:
       manual:
@@ -37,7 +39,7 @@ requirements:
           parameters:
               TARGET: guest
   - name: OpenSSL
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Base OS
     tests:
       automated:
@@ -45,14 +47,14 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: Networking performance
-    owner: alan.bennett@linaro.org
+    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: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Performance
     tests:
        automated:
@@ -63,7 +65,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: Disk performance
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Performance
     tests:
       automated:
@@ -79,8 +81,11 @@ requirements:
         - 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: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Performance
     tests:
        automated:
@@ -91,7 +96,7 @@ requirements:
           repository: https://git.linaro.org/qa/test-definitions.git
           mandatory: True
   - name: Apache webserver performance
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Performance
     tests:
        automated:
@@ -102,7 +107,7 @@ requirements:
               NUMBER: 10000
               CONCURENT: 500
   - name: NGiNX webserver performance
-    owner: alan.bennett@linaro.org
+    owner: martin.stadtler@linaro.org
     category: Performance
     tests:
        automated:
@@ -120,3 +125,16 @@ requirements:
         - 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: "percpu cpu memory threads mutex oltp"
diff --git a/plans/erp/erp-stress.yaml b/plans/erp/erp-stress.yaml
new file mode 100644
index 00000000..f3422d1c
--- /dev/null
+++ b/plans/erp/erp-stress.yaml
@@ -0,0 +1,50 @@
+metadata:
+  name: erp-stress
+  description: Test plan for EE RPB. Common features across all boards
+  os: Debian
+  devices:
+    - d03
+    - d05
+    - thunderX
+    - moonshot
+    - mustang
+    - overdrive
+  maintainer:
+    - milosz.wasilewski@linaro.org
+    - dan.rue@linaro.org
+    - chase.qi@linaro.org
+  approver:
+    - milosz.wasilewski@linaro.org
+  format: Linaro Test Plan v1
+
+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"
diff --git a/plans/rpb_ee/rpb_ee_stress.yaml b/plans/rpb_ee/rpb_ee_stress.yaml
deleted file mode 100644
index 787a3287..00000000
--- a/plans/rpb_ee/rpb_ee_stress.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-metadata:
-  name: rpb-ee-1612-stress
-  description: Test plan for EE RPB. Common features across all boards
-  os: CentOS
-  devices:
-    - d03
-    - d05
-    - thunderX
-    - moonshot
-    - mustang
-    - overdrive
-  maintainer:
-    - milosz.wasilewski@linaro.org
-  approver:
-    - alan.benett@linaro.org
-  format: Linaro Test Plan v1
-
-requirements:
-  - name: System robustness
-    owner: alan.bennett@linaro.org
-    category: Performance
-    tests:
-      automated:
-        - path: 24h-stress-test.yaml
-          repository: https://git.linaro.org/qa/24h-stress-test.git
-          mandatory: True
-          parameters:
-              TEST: stress_ng
-        - path: 24h-stress-test.yaml
-          repository: https://git.linaro.org/qa/24h-stress-test.git
-          mandatory: True
-          parameters:
-              TEST: stress_oom
-        - path: 24h-stress-test.yaml
-          repository: https://git.linaro.org/qa/24h-stress-test.git
-          mandatory: True
-          parameters:
-              TEST: stress_network
-              INTERFACE: eth0 # might be different for each platform with systemd
-        # memory errors (using SoC counters) when CPU runs at full capacity
-        #   for a long time
-        # network bandwith/latency stability with system running at high load