WA2: Juno: Adding uninstall_apk: true

In order to preserve space and make sure nothing is polluting results
we should uninstall benchmarks after running.
For WA this is done by using uninstall_apk parameter

Example:

- id: b10
          name: sqlitebm
          workload_parameters:
                uninstall_apk: true

Change-Id: Ic8dd8f924e002a0086f7ebb7ddcbed9d937adc8d
Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

48 files changed, 78 insertions, 6 deletions

diff --git a/templates/a53only_andbench_t1.yaml b/templates/a53only_andbench_t1.yaml
index a1b58b2..51d3b4a 100644
--- a/templates/a53only_andbench_t1.yaml
+++ b/templates/a53only_andbench_t1.yaml
@@ -21,3 +21,4 @@ workloads:
           name: andebench
           workload_parameters:
                 number_of_threads: 1
+                uninstall_apk: true
diff --git a/templates/a53only_andbench_t5.yaml b/templates/a53only_andbench_t5.yaml
index 8cceaf1..3ef58a2 100644
--- a/templates/a53only_andbench_t5.yaml
+++ b/templates/a53only_andbench_t5.yaml
@@ -21,3 +21,4 @@ workloads:
           name: andebench
           workload_parameters:
                 number_of_threads: 5
+                uninstall_apk: true
diff --git a/templates/a53only_antutu_4.0.3.yaml b/templates/a53only_antutu_4.0.3.yaml
index 2a625b0..9aef706 100644
--- a/templates/a53only_antutu_4.0.3.yaml
+++ b/templates/a53only_antutu_4.0.3.yaml
@@ -22,3 +22,4 @@ workloads:
           label: antutu4.0.3
           workload_parameters:
                 version: 4.0.3
+                uninstall_apk: true
diff --git a/templates/a53only_benchmarkpi.yaml b/templates/a53only_benchmarkpi.yaml
index 0d8339d..ea44c65 100644
--- a/templates/a53only_benchmarkpi.yaml
+++ b/templates/a53only_benchmarkpi.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: benchmarkpi
           name: benchmarkpi
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a53only_caffeinemark.yaml b/templates/a53only_caffeinemark.yaml
index e46b5d0..c819a30 100644
--- a/templates/a53only_caffeinemark.yaml
+++ b/templates/a53only_caffeinemark.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: caffeinemark
           name: caffeinemark
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a53only_cfbench.yaml b/templates/a53only_cfbench.yaml
index 46828ab..1346c54 100644
--- a/templates/a53only_cfbench.yaml
+++ b/templates/a53only_cfbench.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: cfbench
           name: cfbench
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a53only_geekbench3.yaml b/templates/a53only_geekbench3.yaml
index f38bdf9..e9e2c09 100644
--- a/templates/a53only_geekbench3.yaml
+++ b/templates/a53only_geekbench3.yaml
@@ -22,3 +22,4 @@ workloads:
           label: geekbench3
           workload_parameters:
                 version: 3
+                uninstall_apk: true
diff --git a/templates/a53only_glbenchmark_egypt_off_screen.yaml b/templates/a53only_glbenchmark_egypt_off_screen.yaml
index 63ae6ad..4898b8b 100644
--- a/templates/a53only_glbenchmark_egypt_off_screen.yaml
+++ b/templates/a53only_glbenchmark_egypt_off_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.5.1
                 variant: offscreen
+                uninstall_apk: true
diff --git a/templates/a53only_glbenchmark_egypt_on_screen.yaml b/templates/a53only_glbenchmark_egypt_on_screen.yaml
index 93d876c..14f8c59 100644
--- a/templates/a53only_glbenchmark_egypt_on_screen.yaml
+++ b/templates/a53only_glbenchmark_egypt_on_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.5.1
                 variant: onscreen
+                uninstall_apk: true
diff --git a/templates/a53only_glbenchmark_t-rex_off_screen.yaml b/templates/a53only_glbenchmark_t-rex_off_screen.yaml
index 7e1c9e9..9636c46 100644
--- a/templates/a53only_glbenchmark_t-rex_off_screen.yaml
+++ b/templates/a53only_glbenchmark_t-rex_off_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.7.0
                 variant: offscreen
+                uninstall_apk: true
diff --git a/templates/a53only_glbenchmark_t-rex_on_screen.yaml b/templates/a53only_glbenchmark_t-rex_on_screen.yaml
index d53050c..efe99d2 100644
--- a/templates/a53only_glbenchmark_t-rex_on_screen.yaml
+++ b/templates/a53only_glbenchmark_t-rex_on_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.7.0
                 variant: onscreen
+                uninstall_apk: true
diff --git a/templates/a53only_linpack.yaml b/templates/a53only_linpack.yaml
index 05c0c2d..62066cd 100644
--- a/templates/a53only_linpack.yaml
+++ b/templates/a53only_linpack.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: linpack
           name: linpack
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a53only_quadrant.yaml b/templates/a53only_quadrant.yaml
index 6e87515..e83a3c1 100644
--- a/templates/a53only_quadrant.yaml
+++ b/templates/a53only_quadrant.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: quadrant
           name: quadrant
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a53only_smartbench.yaml b/templates/a53only_smartbench.yaml
index 8f9d7b2..61acc55 100644
--- a/templates/a53only_smartbench.yaml
+++ b/templates/a53only_smartbench.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: smartbench
           name: smartbench
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a53only_sqlite.yaml b/templates/a53only_sqlite.yaml
index e219f52..03f4bb2 100644
--- a/templates/a53only_sqlite.yaml
+++ b/templates/a53only_sqlite.yaml
@@ -17,5 +17,7 @@ sections:
                         /sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load: 85
                         /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq: 700000
 workloads:
-        - id: sqlite
-          name: sqlite
+        - id: sqlitebm
+          name: sqlitebm
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a53only_vellamo.yaml b/templates/a53only_vellamo.yaml
index 263fd4f..59f5551 100644
--- a/templates/a53only_vellamo.yaml
+++ b/templates/a53only_vellamo.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: vellamo
           name: vellamo
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_andbench_t1.yaml b/templates/a57only_andbench_t1.yaml
index e3938ac..87bb534 100644
--- a/templates/a57only_andbench_t1.yaml
+++ b/templates/a57only_andbench_t1.yaml
@@ -21,3 +21,4 @@ workloads:
           name: andebench
           workload_parameters:
                 number_of_threads: 1
+                uninstall_apk: true
diff --git a/templates/a57only_andbench_t5.yaml b/templates/a57only_andbench_t5.yaml
index 5b51d36..dd3cebd 100644
--- a/templates/a57only_andbench_t5.yaml
+++ b/templates/a57only_andbench_t5.yaml
@@ -22,3 +22,4 @@ workloads:
           label: andebenchst
           workload_parameters:
                 number_of_threads: 5
+                uninstall_apk: true
diff --git a/templates/a57only_antutu_4.0.3.yaml b/templates/a57only_antutu_4.0.3.yaml
index efe68b9..16ba901 100644
--- a/templates/a57only_antutu_4.0.3.yaml
+++ b/templates/a57only_antutu_4.0.3.yaml
@@ -22,3 +22,4 @@ workloads:
           label: antutu4.0.3
           workload_parameters:
                 version: 4.0.3
+                uninstall_apk: true
diff --git a/templates/a57only_benchmarkpi.yaml b/templates/a57only_benchmarkpi.yaml
index 285394a..3423091 100644
--- a/templates/a57only_benchmarkpi.yaml
+++ b/templates/a57only_benchmarkpi.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: benchmarkpi
           name: benchmarkpi
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_caffeinemark.yaml b/templates/a57only_caffeinemark.yaml
index 3334f1f..909e4fa 100644
--- a/templates/a57only_caffeinemark.yaml
+++ b/templates/a57only_caffeinemark.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: caffeinemark
           name: caffeinemark
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_cfbench.yaml b/templates/a57only_cfbench.yaml
index 373c100..880f348 100644
--- a/templates/a57only_cfbench.yaml
+++ b/templates/a57only_cfbench.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: cfbench
           name: cfbench
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_geekbench3.yaml b/templates/a57only_geekbench3.yaml
index 00ff7f5..d196621 100644
--- a/templates/a57only_geekbench3.yaml
+++ b/templates/a57only_geekbench3.yaml
@@ -22,3 +22,4 @@ workloads:
           label: geekbench3
           workload_parameters:
                 version: 3
+                uninstall_apk: true
diff --git a/templates/a57only_glbenchmark_egypt_off_screen.yaml b/templates/a57only_glbenchmark_egypt_off_screen.yaml
index 9497cd5..3b324e0 100644
--- a/templates/a57only_glbenchmark_egypt_off_screen.yaml
+++ b/templates/a57only_glbenchmark_egypt_off_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.5.1
                 variant: offscreen
+                uninstall_apk: true
diff --git a/templates/a57only_glbenchmark_egypt_on_screen.yaml b/templates/a57only_glbenchmark_egypt_on_screen.yaml
index 3e67fda..0542955 100644
--- a/templates/a57only_glbenchmark_egypt_on_screen.yaml
+++ b/templates/a57only_glbenchmark_egypt_on_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.5.1
                 variant: onscreen
+                uninstall_apk: true
diff --git a/templates/a57only_glbenchmark_t-rex_off_screen.yaml b/templates/a57only_glbenchmark_t-rex_off_screen.yaml
index e9316d9..8e08959 100644
--- a/templates/a57only_glbenchmark_t-rex_off_screen.yaml
+++ b/templates/a57only_glbenchmark_t-rex_off_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.7.0
                 variant: offscreen
+                uninstall_apk: true
diff --git a/templates/a57only_glbenchmark_t-rex_on_screen.yaml b/templates/a57only_glbenchmark_t-rex_on_screen.yaml
index 8109a65..f9dcca5 100644
--- a/templates/a57only_glbenchmark_t-rex_on_screen.yaml
+++ b/templates/a57only_glbenchmark_t-rex_on_screen.yaml
@@ -23,3 +23,4 @@ workloads:
           workload_parameters:
                 version: 2.7.0
                 variant: onscreen
+                uninstall_apk: true
diff --git a/templates/a57only_linpack.yaml b/templates/a57only_linpack.yaml
index 943a4c3..5e5373a 100644
--- a/templates/a57only_linpack.yaml
+++ b/templates/a57only_linpack.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: linpack
           name: linpack
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_quadrant.yaml b/templates/a57only_quadrant.yaml
index d841fa8..3eaf36b 100644
--- a/templates/a57only_quadrant.yaml
+++ b/templates/a57only_quadrant.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: quadrant
           name: quadrant
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_smartbench.yaml b/templates/a57only_smartbench.yaml
index 75be98c..cebd510 100644
--- a/templates/a57only_smartbench.yaml
+++ b/templates/a57only_smartbench.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: smartbench
           name: smartbench
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_sqlite.yaml b/templates/a57only_sqlite.yaml
index 93af1a2..1207518 100644
--- a/templates/a57only_sqlite.yaml
+++ b/templates/a57only_sqlite.yaml
@@ -17,5 +17,7 @@ sections:
                         /sys/devices/system/cpu/cpu1/cpufreq/interactive/go_hispeed_load: 85
                         /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq: 800000
 workloads:
-        - id: sqlite
-          name: sqlite
+        - id: sqlitebm
+          name: sqlitebm
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/a57only_vellamo.yaml b/templates/a57only_vellamo.yaml
index 2a853a9..2eb793b 100644
--- a/templates/a57only_vellamo.yaml
+++ b/templates/a57only_vellamo.yaml
@@ -19,3 +19,5 @@ sections:
 workloads:
         - id: vellamo
           name: vellamo
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_andbench_t1.yaml b/templates/hmp_juno_andbench_t1.yaml
index e6669ca..c6bacb7 100644
--- a/templates/hmp_juno_andbench_t1.yaml
+++ b/templates/hmp_juno_andbench_t1.yaml
@@ -24,3 +24,4 @@ workloads:
           name: andebench
           workload_parameters:
                 number_of_threads: 1
+                uninstall_apk: true
diff --git a/templates/hmp_juno_andbench_t5.yaml b/templates/hmp_juno_andbench_t5.yaml
index f6ae5d2..f0dd7c8 100644
--- a/templates/hmp_juno_andbench_t5.yaml
+++ b/templates/hmp_juno_andbench_t5.yaml
@@ -24,3 +24,4 @@ workloads:
           name: andebench
           workload_parameters:
                 number_of_threads: 5
+                uninstall_apk: true
diff --git a/templates/hmp_juno_antutu_4.0.3.yaml b/templates/hmp_juno_antutu_4.0.3.yaml
index 3eff611..b7e3492 100644
--- a/templates/hmp_juno_antutu_4.0.3.yaml
+++ b/templates/hmp_juno_antutu_4.0.3.yaml
@@ -25,3 +25,4 @@ workloads:
           label: antutu4.0.3
           workload_parameters:
                 version: 4.0.3
+                uninstall_apk: true
diff --git a/templates/hmp_juno_benchmarkpi.yaml b/templates/hmp_juno_benchmarkpi.yaml
index bea3a43..8481541 100644
--- a/templates/hmp_juno_benchmarkpi.yaml
+++ b/templates/hmp_juno_benchmarkpi.yaml
@@ -22,3 +22,5 @@ sections:
 workloads:
         - id: benchmarkpi
           name: benchmarkpi
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_caffeinemark.yaml b/templates/hmp_juno_caffeinemark.yaml
index b12925e..2170b6a 100644
--- a/templates/hmp_juno_caffeinemark.yaml
+++ b/templates/hmp_juno_caffeinemark.yaml
@@ -22,3 +22,5 @@ sections:
 workloads:
         - id: caffeinemark
           name: caffeinemark
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_cfbench.yaml b/templates/hmp_juno_cfbench.yaml
index 95d7c0d..aed6ac5 100644
--- a/templates/hmp_juno_cfbench.yaml
+++ b/templates/hmp_juno_cfbench.yaml
@@ -22,3 +22,5 @@ sections:
 workloads:
         - id: cfbench
           name: cfbench
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_geekbench3.yaml b/templates/hmp_juno_geekbench3.yaml
index d0d4405..8c1eadc 100644
--- a/templates/hmp_juno_geekbench3.yaml
+++ b/templates/hmp_juno_geekbench3.yaml
@@ -25,3 +25,4 @@ workloads:
           label: geekbench3
           workload_parameters:
                 version: 3
+                uninstall_apk: true
diff --git a/templates/hmp_juno_glbenchmark_egypt_off_screen.yaml b/templates/hmp_juno_glbenchmark_egypt_off_screen.yaml
index 4b53281..544c0b4 100644
--- a/templates/hmp_juno_glbenchmark_egypt_off_screen.yaml
+++ b/templates/hmp_juno_glbenchmark_egypt_off_screen.yaml
@@ -26,3 +26,4 @@ workloads:
           workload_parameters:
                 version: 2.5.1
                 variant: offscreen
+                uninstall_apk: true
diff --git a/templates/hmp_juno_glbenchmark_egypt_on_screen.yaml b/templates/hmp_juno_glbenchmark_egypt_on_screen.yaml
index 0fcdc3e..27d89f3 100644
--- a/templates/hmp_juno_glbenchmark_egypt_on_screen.yaml
+++ b/templates/hmp_juno_glbenchmark_egypt_on_screen.yaml
@@ -26,3 +26,4 @@ workloads:
           workload_parameters:
                 version: 2.5.1
                 variant: onscreen
+                uninstall_apk: true
diff --git a/templates/hmp_juno_glbenchmark_t-rex_off_screen.yaml b/templates/hmp_juno_glbenchmark_t-rex_off_screen.yaml
index dd2559b..eb7c489 100644
--- a/templates/hmp_juno_glbenchmark_t-rex_off_screen.yaml
+++ b/templates/hmp_juno_glbenchmark_t-rex_off_screen.yaml
@@ -26,3 +26,4 @@ workloads:
           workload_parameters:
                 version: 2.7.0
                 variant: offscreen
+                uninstall_apk: true
diff --git a/templates/hmp_juno_glbenchmark_t-rex_on_screen.yaml b/templates/hmp_juno_glbenchmark_t-rex_on_screen.yaml
index c976333..b96d430 100644
--- a/templates/hmp_juno_glbenchmark_t-rex_on_screen.yaml
+++ b/templates/hmp_juno_glbenchmark_t-rex_on_screen.yaml
@@ -26,3 +26,4 @@ workloads:
           workload_parameters:
                 version: 2.7.0
                 variant: onscreen
+                uninstall_apk: true
diff --git a/templates/hmp_juno_linpack.yaml b/templates/hmp_juno_linpack.yaml
index 01d05cc..f0b295c 100644
--- a/templates/hmp_juno_linpack.yaml
+++ b/templates/hmp_juno_linpack.yaml
@@ -22,3 +22,5 @@ sections:
 workloads:
         - id: linpack
           name: linpack
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_quadrant.yaml b/templates/hmp_juno_quadrant.yaml
index 6dd2887..8d9e952 100644
--- a/templates/hmp_juno_quadrant.yaml
+++ b/templates/hmp_juno_quadrant.yaml
@@ -22,3 +22,5 @@ sections:
 workloads:
         - id: quadrant
           name: quadrant
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_smartbench.yaml b/templates/hmp_juno_smartbench.yaml
index f38f478..b265ee3 100644
--- a/templates/hmp_juno_smartbench.yaml
+++ b/templates/hmp_juno_smartbench.yaml
@@ -22,3 +22,5 @@ sections:
 workloads:
         - id: smartbench
           name: smartbench
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_sqlite.yaml b/templates/hmp_juno_sqlite.yaml
index cde07ac..dd52d6d 100644
--- a/templates/hmp_juno_sqlite.yaml
+++ b/templates/hmp_juno_sqlite.yaml
@@ -20,5 +20,7 @@ sections:
                         /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq: 700000
                         /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq: 800000
 workloads:
-        - id: sqlite
-          name: sqlite
+        - id: sqlitebm
+          name: sqlitebm
+          workload_parameters:
+                uninstall_apk: true
diff --git a/templates/hmp_juno_vellamo.yaml b/templates/hmp_juno_vellamo.yaml
index 004242a..b799f0f 100644
--- a/templates/hmp_juno_vellamo.yaml
+++ b/templates/hmp_juno_vellamo.yaml
@@ -22,3 +22,5 @@ sections:
 workloads:
         - id: vellamo
           name: vellamo
+          workload_parameters:
+                uninstall_apk: true