Merge branch 'master' of ssh://git.linaro.org/qa/wa2-lava2014.12

44 files changed, 44 insertions, 132 deletions

diff --git a/templates/a15only_andbench_t1.yaml b/templates/a15only_andbench_t1.yaml
index 583821c..24ddc11 100644
--- a/templates/a15only_andbench_t1.yaml
+++ b/templates/a15only_andbench_t1.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1a_a15
+  - id: 1a_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_andbench_t5.yaml b/templates/a15only_andbench_t5.yaml
index 58e0c2f..436890d 100644
--- a/templates/a15only_andbench_t5.yaml
+++ b/templates/a15only_andbench_t5.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1a_a15
+  - id: 1a_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_antutu_4.0.3.yaml b/templates/a15only_antutu_4.0.3.yaml
index 9513fc6..bebe4c7 100644
--- a/templates/a15only_antutu_4.0.3.yaml
+++ b/templates/a15only_antutu_4.0.3.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 5
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1c_a15
+  - id: 1c_a15
     label: antutu4.0.3
     runtime_parameters:
         a15_governor_tunables:
diff --git a/templates/a15only_audio.yaml b/templates/a15only_audio.yaml
index 11e15fe..de1ada9 100644
--- a/templates/a15only_audio.yaml
+++ b/templates/a15only_audio.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1b_a15_audio
+  - id: 1b_a15_audio
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_bbench_audio.yaml b/templates/a15only_bbench_audio.yaml
index 292b506..01d8b46 100644
--- a/templates/a15only_bbench_audio.yaml
+++ b/templates/a15only_bbench_audio.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1a_a15_bbench_audio
+  - id: 1a_a15_bbench_audio
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_benchmarkpi.yaml b/templates/a15only_benchmarkpi.yaml
index 1f7395b..d28e661 100644
--- a/templates/a15only_benchmarkpi.yaml
+++ b/templates/a15only_benchmarkpi.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 5
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1e_a15
+  - id: 1e_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_caffeinemark.yaml b/templates/a15only_caffeinemark.yaml
index aacc195..a5385d3 100644
--- a/templates/a15only_caffeinemark.yaml
+++ b/templates/a15only_caffeinemark.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1f_a15
+  - id: 1f_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_cfbench.yaml b/templates/a15only_cfbench.yaml
index 9d9af28..c5d5747 100644
--- a/templates/a15only_cfbench.yaml
+++ b/templates/a15only_cfbench.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1g_a15
+  - id: 1g_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_geekbench3.yaml b/templates/a15only_geekbench3.yaml
index 6fadee0..f4bf77f 100644
--- a/templates/a15only_geekbench3.yaml
+++ b/templates/a15only_geekbench3.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1h_a15
+  - id: 1h_a15
     label: geekbench3
     runtime_parameters:
         a15_governor_tunables:
diff --git a/templates/a15only_linpack.yaml b/templates/a15only_linpack.yaml
index 4e2328b..b0006ca 100644
--- a/templates/a15only_linpack.yaml
+++ b/templates/a15only_linpack.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1i_a15
+  - id: 1i_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_quadrant.yaml b/templates/a15only_quadrant.yaml
index bb9eca7..e4100a1 100644
--- a/templates/a15only_quadrant.yaml
+++ b/templates/a15only_quadrant.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1j_a15
+  - id: 1j_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_smartbench.yaml b/templates/a15only_smartbench.yaml
index 1ffe1d5..ed28014 100644
--- a/templates/a15only_smartbench.yaml
+++ b/templates/a15only_smartbench.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1k_a15
+  - id: 1k_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_sqlite.yaml b/templates/a15only_sqlite.yaml
index 0a36f4c..11de209 100644
--- a/templates/a15only_sqlite.yaml
+++ b/templates/a15only_sqlite.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1l_a15
+  - id: 1l_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a15only_vellamo.yaml b/templates/a15only_vellamo.yaml
index 135c4bd..18a0e57 100644
--- a/templates/a15only_vellamo.yaml
+++ b/templates/a15only_vellamo.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a15_only
-    id: 1o_a15
+  - id: 1o_a15
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a7only_audio.yaml b/templates/a7only_audio.yaml
index f0be43e..8da3cdd 100644
--- a/templates/a7only_audio.yaml
+++ b/templates/a7only_audio.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_only
-    id: 4b_a7_audio
+  - id: 4b_a7_audio
     runtime_parameters:
         a7_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/a7only_bbench_audio.yaml b/templates/a7only_bbench_audio.yaml
index 3a2586d..7778a0b 100644
--- a/templates/a7only_bbench_audio.yaml
+++ b/templates/a7only_bbench_audio.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_only
-    id: 4a_a7_bbench_audio
+  - id: 4a_a7_bbench_audio
     runtime_parameters:
         a7_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_andbench_t1.yaml b/templates/hmp_andbench_t1.yaml
index 8e95d52..75af073 100644
--- a/templates/hmp_andbench_t1.yaml
+++ b/templates/hmp_andbench_t1.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2a_a7bc
+  - id: 2a_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_andbench_t5.yaml b/templates/hmp_andbench_t5.yaml
index d031404..1703627 100644
--- a/templates/hmp_andbench_t5.yaml
+++ b/templates/hmp_andbench_t5.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2a_a7bc
+  - id: 2a_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_antutu_4.0.3.yaml b/templates/hmp_antutu_4.0.3.yaml
index 0f6a7f0..eeab767 100644
--- a/templates/hmp_antutu_4.0.3.yaml
+++ b/templates/hmp_antutu_4.0.3.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2c_a7bc
+  - id: 2c_a7bc
     label: antutu4.0.3
     runtime_parameters:
         a15_governor_tunables:
diff --git a/templates/hmp_audio.yaml b/templates/hmp_audio.yaml
index 83431a4..e134fdd 100644
--- a/templates/hmp_audio.yaml
+++ b/templates/hmp_audio.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2b_a7bc_audio
+  - id: 2b_a7bc_audio
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_bbench_audio.yaml b/templates/hmp_bbench_audio.yaml
index 68e3a10..0beebc2 100644
--- a/templates/hmp_bbench_audio.yaml
+++ b/templates/hmp_bbench_audio.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2a_a7bc_bbench_audio
+  - id: 2a_a7bc_bbench_audio
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_benchmarkpi.yaml b/templates/hmp_benchmarkpi.yaml
index 3c13d58..dc9853e 100644
--- a/templates/hmp_benchmarkpi.yaml
+++ b/templates/hmp_benchmarkpi.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2e_a7bc
+  - id: 2e_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_caffeinemark.yaml b/templates/hmp_caffeinemark.yaml
index 573ddf5..5247304 100644
--- a/templates/hmp_caffeinemark.yaml
+++ b/templates/hmp_caffeinemark.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2f_a7bc
+  - id: 2f_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_cfbench.yaml b/templates/hmp_cfbench.yaml
index 665d79a..225569a 100644
--- a/templates/hmp_cfbench.yaml
+++ b/templates/hmp_cfbench.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2g_a7bc
+  - id: 2g_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_geekbench3.yaml b/templates/hmp_geekbench3.yaml
index 4ab86c9..0b71928 100644
--- a/templates/hmp_geekbench3.yaml
+++ b/templates/hmp_geekbench3.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2h_a7bc
+  - id: 2h_a7bc
     label: geekbench3
     runtime_parameters:
         a15_governor_tunables:
diff --git a/templates/hmp_linpack.yaml b/templates/hmp_linpack.yaml
index 7019653..53f8396 100644
--- a/templates/hmp_linpack.yaml
+++ b/templates/hmp_linpack.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2i_a7bc
+  - id: 2i_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_quadrant.yaml b/templates/hmp_quadrant.yaml
index a0ca5ea..1554fd2 100644
--- a/templates/hmp_quadrant.yaml
+++ b/templates/hmp_quadrant.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2j_a7bc
+  - id: 2j_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_smartbench.yaml b/templates/hmp_smartbench.yaml
index 41d4acf..8e681b9 100644
--- a/templates/hmp_smartbench.yaml
+++ b/templates/hmp_smartbench.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2k_a7bc
+  - id: 2k_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_sqlite.yaml b/templates/hmp_sqlite.yaml
index 7ec5565..b6580fd 100644
--- a/templates/hmp_sqlite.yaml
+++ b/templates/hmp_sqlite.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2l_a7bc
+  - id: 2l_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/hmp_vellamo.yaml b/templates/hmp_vellamo.yaml
index b5b883e..f94059b 100644
--- a/templates/hmp_vellamo.yaml
+++ b/templates/hmp_vellamo.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: mp_a7_bootcluster
-    id: 2o_a7bc
+  - id: 2o_a7bc
     runtime_parameters:
         a15_governor_tunables:
             above_hispeed_delay: 20000
diff --git a/templates/iks_andbench_t1.yaml b/templates/iks_andbench_t1.yaml
index d086720..0d506ca 100644
--- a/templates/iks_andbench_t1.yaml
+++ b/templates/iks_andbench_t1.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3a_iks
+  - id: 3a_iks
     workload_name: andebench
     workload_parameters:
         number_of_threads: 1
diff --git a/templates/iks_andbench_t5.yaml b/templates/iks_andbench_t5.yaml
index f91ede0..0ee59a4 100644
--- a/templates/iks_andbench_t5.yaml
+++ b/templates/iks_andbench_t5.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3b_iks
+  - id: 3b_iks
     workload_name: andebench
     workload_parameters:
         number_of_threads: 1
diff --git a/templates/iks_antutu_4.0.3.yaml b/templates/iks_antutu_4.0.3.yaml
index 9f170af..8f1f3eb 100644
--- a/templates/iks_antutu_4.0.3.yaml
+++ b/templates/iks_antutu_4.0.3.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3c_iks
+  - id: 3c_iks
     label: antutu4.0.3
     workload_name: antutu
     workload_parameters:
diff --git a/templates/iks_audio.yaml b/templates/iks_audio.yaml
index 8af2972..c161106 100644
--- a/templates/iks_audio.yaml
+++ b/templates/iks_audio.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3b_iks_audio
+  - id: 3b_iks_audio
     workload_name: audio
diff --git a/templates/iks_bbench_audio.yaml b/templates/iks_bbench_audio.yaml
index 8979f50..1f3b132 100644
--- a/templates/iks_bbench_audio.yaml
+++ b/templates/iks_bbench_audio.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3a_iks_bbench_audio
+  - id: 3a_iks_bbench_audio
     workload_name: bbench
     workload_parameters:
         with_audio: true
diff --git a/templates/iks_benchmarkpi.yaml b/templates/iks_benchmarkpi.yaml
index a77daa5..7948862 100644
--- a/templates/iks_benchmarkpi.yaml
+++ b/templates/iks_benchmarkpi.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3e_iks
+  - id: 3e_iks
     workload_name: benchmarkpi
diff --git a/templates/iks_caffeinemark.yaml b/templates/iks_caffeinemark.yaml
index 7e5e7a6..c06ab2a 100644
--- a/templates/iks_caffeinemark.yaml
+++ b/templates/iks_caffeinemark.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3f_iks
+  - id: 3f_iks
     workload_name: caffeinemark
diff --git a/templates/iks_cfbench.yaml b/templates/iks_cfbench.yaml
index 3d4621f..15940fb 100644
--- a/templates/iks_cfbench.yaml
+++ b/templates/iks_cfbench.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3g_iks
+  - id: 3g_iks
     workload_name: cfbench
diff --git a/templates/iks_geekbench3.yaml b/templates/iks_geekbench3.yaml
index 6418148..378962b 100644
--- a/templates/iks_geekbench3.yaml
+++ b/templates/iks_geekbench3.yaml
@@ -6,9 +6,7 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3h_iks
+  - id: 3h_iks
     label: geekbench3
     workload_name: geekbench
     workload_parameters:
diff --git a/templates/iks_linpack.yaml b/templates/iks_linpack.yaml
index 49093a7..4063277 100644
--- a/templates/iks_linpack.yaml
+++ b/templates/iks_linpack.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3i_iks
+  - id: 3i_iks
     workload_name: linpack
diff --git a/templates/iks_quadrant.yaml b/templates/iks_quadrant.yaml
index 87299bd..807c83b 100644
--- a/templates/iks_quadrant.yaml
+++ b/templates/iks_quadrant.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3j_iks
+  - id: 3j_iks
     workload_name: quadrant
diff --git a/templates/iks_smartbench.yaml b/templates/iks_smartbench.yaml
index dcee398..73e9f69 100644
--- a/templates/iks_smartbench.yaml
+++ b/templates/iks_smartbench.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3k_iks
+  - id: 3k_iks
     workload_name: smartbench
diff --git a/templates/iks_sqlite.yaml b/templates/iks_sqlite.yaml
index fb7965c..3bc4412 100644
--- a/templates/iks_sqlite.yaml
+++ b/templates/iks_sqlite.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3l_iks
+  - id: 3l_iks
     workload_name: sqlite
diff --git a/templates/iks_vellamo.yaml b/templates/iks_vellamo.yaml
index 25cddad..17af8a9 100644
--- a/templates/iks_vellamo.yaml
+++ b/templates/iks_vellamo.yaml
@@ -6,7 +6,5 @@ config:
 global:
     iterations: 1
 workloads:
--   boot_parameters:
-        os_mode: iks_cpu
-    id: 3o_iks
+  - id: 3o_iks
     workload_name: vellamo